getUpgradeTask(@RequestParam("id") Long id) {
+ IotOtaUpgradeTaskDO upgradeTask = upgradeTaskService.getUpgradeTask(id);
+ return success(BeanUtils.toBean(upgradeTask, IotOtaUpgradeTaskRespVO.class));
+ }
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/firmware/IotOtaFirmwareCommonReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/firmware/IotOtaFirmwareCommonReqVO.java
new file mode 100644
index 0000000000..2799907cea
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/firmware/IotOtaFirmwareCommonReqVO.java
@@ -0,0 +1,27 @@
+package cn.iocoder.yudao.module.iot.controller.admin.ota.vo.firmware;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
+
+// TODO @li：因为 create 和 update 可以公用的字段比较少，建议不用 IotOtaFirmwareCommonReqVO
+@Data
+@Schema(description = "管理后台 - OTA固件信息 Request VO")
+public class IotOtaFirmwareCommonReqVO {
+
+ /**
+ * 固件名称
+ */
+ @NotEmpty(message = "固件名称不能为空")
+ @Schema(description = "固件名称", requiredMode = REQUIRED, example = "智能开关固件")
+ private String name;
+
+ /**
+ * 固件描述
+ */
+ @Schema(description = "固件描述", example = "某品牌型号固件，测试用")
+ private String description;
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/firmware/IotOtaFirmwareCreateReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/firmware/IotOtaFirmwareCreateReqVO.java
new file mode 100644
index 0000000000..b194cde776
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/firmware/IotOtaFirmwareCreateReqVO.java
@@ -0,0 +1,79 @@
+package cn.iocoder.yudao.module.iot.controller.admin.ota.vo.firmware;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
+
+// TODO @li：中英文之间，有个空格。中文写作习惯哈。
+@Schema(description = "管理后台 - OTA固件创建 Request VO")
+@Data
+public class IotOtaFirmwareCreateReqVO extends IotOtaFirmwareCommonReqVO {
+
+ // TODO @li：因为有了注解，注释可以不写哈
+ // TODO @li：swagger 注解，写在 validator 注解之前，保持项目统一哈。
+ /**
+ * 版本号
+ */
+ @NotEmpty(message = "版本号不能为空")
+ @Schema(description = "版本号", requiredMode = REQUIRED, example = "1.0.0")
+ private String version;
+
+ /**
+ * 产品编号
+ *
+ * 关联 {@link cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO#getId()}
+ */
+ @NotNull(message = "产品编号不能为空")
+ @Schema(description = "产品编号", requiredMode = REQUIRED, example = "1024")
+ private String productId;
+
+ // TODO @li：productId 即可，而 productKey 通过 productId 查询
+ /**
+ * 产品标识
+ *
+ * 冗余 {@link cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO#getProductKey()}
+ */
+ @NotEmpty(message = "产品标识不能为空")
+ @Schema(description = "产品标识", requiredMode = REQUIRED, example = "yudao")
+ private String productKey;
+
+ /**
+ * 签名方式
+ *
+ * 例如说：MD5、SHA256
+ */
+ @Schema(description = "签名方式", example = "MD5")
+ private String signMethod;
+
+ // TODO @li：fileSign、fileSize 通过后端下载文件，计算出来。对前端屏蔽这个细节。
+
+ /**
+ * 固件文件签名
+ */
+ @Schema(description = "固件文件签名", example = "d41d8cd98f00b204e9800998ecf8427e")
+ private String fileSign;
+
+ /**
+ * 固件文件大小
+ */
+ @NotNull(message = "固件文件大小不能为空")
+ @Schema(description = "固件文件大小（单位：byte）", example = "1024")
+ private Long fileSize;
+
+ /**
+ * 固件文件 URL
+ */
+ @NotEmpty(message = "固件文件 URL 不能为空")
+ @Schema(description = "固件文件 URL", requiredMode = REQUIRED, example = "https://www.iocoder.cn/yudao-firmware.zip")
+ private String fileUrl;
+
+ /**
+ * 自定义信息，建议使用 JSON 格式
+ */
+ @Schema(description = "自定义信息，建议使用 JSON 格式", example = "{\"key1\":\"value1\",\"key2\":\"value2\"}")
+ private String information;
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/firmware/IotOtaFirmwarePageReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/firmware/IotOtaFirmwarePageReqVO.java
new file mode 100644
index 0000000000..24304202ca
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/firmware/IotOtaFirmwarePageReqVO.java
@@ -0,0 +1,23 @@
+package cn.iocoder.yudao.module.iot.controller.admin.ota.vo.firmware;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(description = "管理后台 - OTA 固件分页 Request VO")
+public class IotOtaFirmwarePageReqVO extends PageParam {
+
+ /**
+ * 固件名称
+ */
+ @Schema(description = "固件名称", example = "智能开关固件")
+ private String name;
+
+ /**
+ * 产品标识
+ */
+ @Schema(description = "产品标识", example = "1024")
+ private String productId;
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/firmware/IotOtaFirmwareRespVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/firmware/IotOtaFirmwareRespVO.java
new file mode 100644
index 0000000000..f9aa25cca7
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/firmware/IotOtaFirmwareRespVO.java
@@ -0,0 +1,85 @@
+package cn.iocoder.yudao.module.iot.controller.admin.ota.vo.firmware;
+
+import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO;
+import com.fhs.core.trans.anno.Trans;
+import com.fhs.core.trans.constant.TransType;
+import com.fhs.core.trans.vo.VO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
+
+@Data
+@Schema(description = "管理后台 - OTA 固件 Response VO")
+public class IotOtaFirmwareRespVO implements VO {
+
+ /**
+ * 固件编号
+ */
+ @Schema(description = "固件编号", requiredMode = REQUIRED, example = "1024")
+ private Long id;
+ /**
+ * 固件名称
+ */
+ @Schema(description = "固件名称", requiredMode = REQUIRED, example = "OTA固件")
+ private String name;
+ /**
+ * 固件描述
+ */
+ @Schema(description = "固件描述")
+ private String description;
+ /**
+ * 版本号
+ */
+ @Schema(description = "版本号", requiredMode = REQUIRED, example = "1.0.0")
+ private String version;
+
+ /**
+ * 产品编号
+ *
+ * 关联 {@link cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO#getId()}
+ */
+ @Schema(description = "产品编号", requiredMode = REQUIRED, example = "1024")
+ @Trans(type = TransType.SIMPLE, target = IotProductDO.class, fields = {"name"}, refs = {"productName"})
+ private String productId;
+ /**
+ * 产品标识
+ *
+ * 冗余 {@link cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO#getProductKey()}
+ */
+ @Schema(description = "产品标识", requiredMode = REQUIRED, example = "iot-product-key")
+ private String productKey;
+ /**
+ * 产品名称
+ */
+ @Schema(description = "产品名称", requiredMode = REQUIRED, example = "OTA产品")
+ private String productName;
+ /**
+ * 签名方式
+ *
+ * 例如说：MD5、SHA256
+ */
+ @Schema(description = "签名方式", example = "MD5")
+ private String signMethod;
+ /**
+ * 固件文件签名
+ */
+ @Schema(description = "固件文件签名", example = "1024")
+ private String fileSign;
+ /**
+ * 固件文件大小
+ */
+ @Schema(description = "固件文件大小", requiredMode = REQUIRED, example = "1024")
+ private Long fileSize;
+ /**
+ * 固件文件 URL
+ */
+ @Schema(description = "固件文件 URL", requiredMode = REQUIRED, example = "https://www.iocoder.cn")
+ private String fileUrl;
+ /**
+ * 自定义信息，建议使用 JSON 格式
+ */
+ @Schema(description = "自定义信息，建议使用 JSON 格式")
+ private String information;
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/firmware/IotOtaFirmwareUpdateReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/firmware/IotOtaFirmwareUpdateReqVO.java
new file mode 100644
index 0000000000..eacbfd2dd7
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/firmware/IotOtaFirmwareUpdateReqVO.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.iot.controller.admin.ota.vo.firmware;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
+
+@Data
+@Schema(description = "管理后台 - OTA固件更新 Request VO")
+public class IotOtaFirmwareUpdateReqVO extends IotOtaFirmwareCommonReqVO {
+
+ /**
+ * 固件编号
+ */
+ @NotNull(message = "固件编号不能为空")
+ @Schema(description = "固件编号", requiredMode = REQUIRED, example = "1024")
+ private Long id;
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/upgrade/record/IotOtaUpgradeRecordPageReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/upgrade/record/IotOtaUpgradeRecordPageReqVO.java
new file mode 100644
index 0000000000..6e083a3323
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/upgrade/record/IotOtaUpgradeRecordPageReqVO.java
@@ -0,0 +1,57 @@
+package cn.iocoder.yudao.module.iot.controller.admin.ota.vo.upgrade.record;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
+
+@Data
+@Schema(description = "管理后台 - OTA升级记录分页 Request VO")
+public class IotOtaUpgradeRecordPageReqVO extends PageParam {
+
+ // TODO @li：使用 IotOtaUpgradeRecordStatusEnum 枚举哈
+ /**
+ * 待处理状态
+ */
+ public static final Integer PENDING = 0;
+ /**
+ * 已推送状态
+ */
+ public static final Integer PUSHED = 10;
+ /**
+ * 正在升级状态
+ */
+ public static final Integer UPGRADING = 20;
+ /**
+ * 升级成功状态
+ */
+ public static final Integer SUCCESS = 30;
+ /**
+ * 升级失败状态
+ */
+ public static final Integer FAILURE = 40;
+ /**
+ * 升级已取消状态
+ */
+ public static final Integer CANCELED = 50;
+
+ /**
+ * 升级任务编号字段。
+ *
+ * 该字段用于标识升级任务的唯一编号，不能为空。
+ */
+ @NotNull(message = "升级任务编号不能为空")
+ @Schema(description = "升级任务编号", requiredMode = REQUIRED, example = "1024")
+ private Long taskId;
+
+ /**
+ * 设备标识字段。
+ *
+ * 该字段用于标识设备的名称，通常用于区分不同的设备。
+ */
+ @Schema(description = "设备标识", requiredMode = REQUIRED, example = "摄像头A1-1")
+ private String deviceName;
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/upgrade/record/IotOtaUpgradeRecordRespVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/upgrade/record/IotOtaUpgradeRecordRespVO.java
new file mode 100644
index 0000000000..d717cfd310
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/upgrade/record/IotOtaUpgradeRecordRespVO.java
@@ -0,0 +1,109 @@
+package cn.iocoder.yudao.module.iot.controller.admin.ota.vo.upgrade.record;
+
+import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.ota.IotOtaFirmwareDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.ota.IotOtaUpgradeTaskDO;
+import com.fhs.core.trans.anno.Trans;
+import com.fhs.core.trans.constant.TransType;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
+
+@Data
+@Schema(description = "管理后台 - OTA升级记录 Response VO")
+public class IotOtaUpgradeRecordRespVO {
+
+ /**
+ * 升级记录编号
+ */
+ @Schema(description = "升级记录编号", requiredMode = REQUIRED, example = "1024")
+ private Long id;
+ /**
+ * 固件编号
+ *
+ * 关联 {@link IotOtaFirmwareDO#getId()}
+ */
+ @Schema(description = "固件编号", requiredMode = REQUIRED, example = "1024")
+ @Trans(type = TransType.SIMPLE, target = IotOtaFirmwareDO.class, fields = {"version"}, refs = {"firmwareVersion"})
+ private Long firmwareId;
+ /**
+ * 固件版本
+ */
+ @Schema(description = "固件版本", requiredMode = REQUIRED, example = "v1.0.0")
+ private String firmwareVersion;
+ /**
+ * 任务编号
+ *
+ * 关联 {@link IotOtaUpgradeTaskDO#getId()}
+ */
+ @Schema(description = "任务编号", requiredMode = REQUIRED, example = "1024")
+ private Long taskId;
+ /**
+ * 产品标识
+ *
+ * 关联 {@link cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO#getId()}
+ */
+ @Schema(description = "产品标识", requiredMode = REQUIRED, example = "iot")
+ private String productKey;
+ /**
+ * 设备名称
+ *
+ * 关联 {@link cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO#getId()}
+ */
+ @Schema(description = "设备名称", requiredMode = REQUIRED, example = "iot")
+ private String deviceName;
+ /**
+ * 设备编号
+ *
+ * 关联 {@link cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO#getId()}
+ */
+ @Schema(description = "设备编号", requiredMode = REQUIRED, example = "1024")
+ private String deviceId;
+ /**
+ * 来源的固件编号
+ *
+ * 关联 {@link IotDeviceDO#getFirmwareId()}
+ */
+ @Schema(description = "来源的固件编号", requiredMode = REQUIRED, example = "1024")
+ @Trans(type = TransType.SIMPLE, target = IotOtaFirmwareDO.class, fields = {"version"}, refs = {"fromFirmwareVersion"})
+ private Long fromFirmwareId;
+ /**
+ * 来源的固件版本
+ */
+ @Schema(description = "来源的固件版本", requiredMode = REQUIRED, example = "v1.0.0")
+ private String fromFirmwareVersion;
+ /**
+ * 升级状态
+ *
+ * 关联 {@link cn.iocoder.yudao.module.iot.enums.ota.IotOtaUpgradeRecordStatusEnum}
+ */
+ @Schema(description = "升级状态", requiredMode = REQUIRED, allowableValues = {"0", "10", "20", "30", "40", "50"})
+ private Integer status;
+ /**
+ * 升级进度，百分比
+ */
+ @Schema(description = "升级进度，百分比", requiredMode = REQUIRED, example = "10")
+ private Integer progress;
+ /**
+ * 升级进度描述
+ *
+ * 注意，只记录设备最后一次的升级进度描述
+ * 如果想看历史记录，可以查看 {@link cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceLogDO} 设备日志
+ */
+ @Schema(description = "升级进度描述", requiredMode = REQUIRED, example = "10")
+ private String description;
+ /**
+ * 升级开始时间
+ */
+ @Schema(description = "升级开始时间", requiredMode = REQUIRED, example = "2022-07-08 07:30:00")
+ private LocalDateTime startTime;
+ /**
+ * 升级结束时间
+ */
+ @Schema(description = "升级结束时间", requiredMode = REQUIRED, example = "2022-07-08 07:30:00")
+ private LocalDateTime endTime;
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/upgrade/task/IotOtaUpgradeTaskPageReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/upgrade/task/IotOtaUpgradeTaskPageReqVO.java
new file mode 100644
index 0000000000..c1f2816c06
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/upgrade/task/IotOtaUpgradeTaskPageReqVO.java
@@ -0,0 +1,27 @@
+package cn.iocoder.yudao.module.iot.controller.admin.ota.vo.upgrade.task;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
+
+@Data
+@Schema(description = "管理后台 - OTA升级任务分页 Request VO")
+public class IotOtaUpgradeTaskPageReqVO extends PageParam {
+
+ /**
+ * 任务名称字段，用于描述任务的名称
+ */
+ @Schema(description = "任务名称", example = "升级任务")
+ private String name;
+
+ /**
+ * 固件编号字段，用于唯一标识固件，不能为空
+ */
+ @NotNull(message = "固件编号不能为空")
+ @Schema(description = "固件编号", requiredMode = REQUIRED, example = "1024")
+ private Long firmwareId;
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/upgrade/task/IotOtaUpgradeTaskRespVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/upgrade/task/IotOtaUpgradeTaskRespVO.java
new file mode 100644
index 0000000000..f8f5320c9d
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/upgrade/task/IotOtaUpgradeTaskRespVO.java
@@ -0,0 +1,84 @@
+package cn.iocoder.yudao.module.iot.controller.admin.ota.vo.upgrade.task;
+
+import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.ota.IotOtaFirmwareDO;
+import com.fhs.core.trans.vo.VO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
+
+@Data
+@Schema(description = "管理后台 - OTA升级任务 Response VO")
+public class IotOtaUpgradeTaskRespVO implements VO {
+
+ /**
+ * 任务编号
+ */
+ @Schema(description = "任务编号", requiredMode = REQUIRED, example = "1024")
+ private Long id;
+ /**
+ * 任务名称
+ */
+ @Schema(description = "任务名称", requiredMode = REQUIRED, example = "升级任务")
+ private String name;
+ /**
+ * 任务描述
+ */
+ @Schema(description = "任务描述", example = "升级任务")
+ private String description;
+ /**
+ * 固件编号
+ *
+ * 关联 {@link IotOtaFirmwareDO#getId()}
+ */
+ @Schema(description = "固件编号", requiredMode = REQUIRED, example = "1024")
+ private Long firmwareId;
+ /**
+ * 任务状态
+ *
+ * 关联 {@link cn.iocoder.yudao.module.iot.enums.ota.IotOtaUpgradeTaskStatusEnum}
+ */
+ @Schema(description = "任务状态", requiredMode = REQUIRED, allowableValues = {"10", "20", "21", "30"})
+ private Integer status;
+ /**
+ * 任务状态名称
+ */
+ @Schema(description = "任务状态名称", requiredMode = REQUIRED, example = "进行中")
+ private String statusName;
+ /**
+ * 升级范围
+ *
+ * 关联 {@link cn.iocoder.yudao.module.iot.enums.ota.IotOtaUpgradeTaskScopeEnum}
+ */
+ @Schema(description = "升级范围", requiredMode = REQUIRED, allowableValues = {"1", "2"})
+ private Integer scope;
+ /**
+ * 设备数量
+ */
+ @Schema(description = "设备数量", requiredMode = REQUIRED, example = "1024")
+ private Long deviceCount;
+ /**
+ * 选中的设备编号数组
+ *
+ * 关联 {@link IotDeviceDO#getId()}
+ */
+ @Schema(description = "选中的设备编号数组", example = "1024")
+ private List deviceIds;
+ /**
+ * 选中的设备名字数组
+ *
+ * 关联 {@link IotDeviceDO#getDeviceName()}
+ */
+ @Schema(description = "选中的设备名字数组", example = "1024")
+ private List deviceNames;
+ /**
+ * 创建时间
+ */
+ @Schema(description = "创建时间", requiredMode = REQUIRED, example = "2022-07-08 07:30:00")
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/upgrade/task/IotOtaUpgradeTaskSaveReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/upgrade/task/IotOtaUpgradeTaskSaveReqVO.java
new file mode 100644
index 0000000000..7cb25299fb
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/upgrade/task/IotOtaUpgradeTaskSaveReqVO.java
@@ -0,0 +1,69 @@
+package cn.iocoder.yudao.module.iot.controller.admin.ota.vo.upgrade.task;
+
+import cn.iocoder.yudao.framework.common.validation.InEnum;
+import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.ota.IotOtaFirmwareDO;
+import cn.iocoder.yudao.module.iot.enums.ota.IotOtaUpgradeTaskScopeEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.util.List;
+
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
+
+@Data
+@Schema(description = "管理后台 - OTA升级任务创建/修改 Request VO")
+public class IotOtaUpgradeTaskSaveReqVO {
+
+ /**
+ * 任务名称
+ */
+ @NotEmpty(message = "任务名称不能为空")
+ @Schema(description = "任务名称", requiredMode = REQUIRED, example = "升级任务")
+ private String name;
+
+ /**
+ * 任务描述
+ */
+ @Schema(description = "任务描述", example = "升级任务")
+ private String description;
+
+ /**
+ * 固件编号
+ *
+ * 关联 {@link IotOtaFirmwareDO#getId()}
+ */
+ @NotNull(message = "固件编号不能为空")
+ @Schema(description = "固件编号", requiredMode = REQUIRED, example = "1024")
+ private Long firmwareId;
+
+ /**
+ * 升级范围
+ *
+ * 关联 {@link cn.iocoder.yudao.module.iot.enums.ota.IotOtaUpgradeTaskScopeEnum}
+ */
+ @NotNull(message = "升级范围不能为空")
+ @InEnum(value = IotOtaUpgradeTaskScopeEnum.class)
+ @Schema(description = "升级范围", requiredMode = REQUIRED, example = "1")
+ private Integer scope;
+
+ /**
+ * 选中的设备编号数组
+ *
+ * 关联 {@link IotDeviceDO#getId()}
+ */
+ @Schema(description = "选中的设备编号数组", requiredMode = REQUIRED, example = "[1,2,3,4]")
+ private List deviceIds;
+
+ // TODO @li：通过 deviceIds 查询 deviceNames，前端不传递哈
+ /**
+ * 选中的设备名字数组
+ *
+ * 关联 {@link IotDeviceDO#getDeviceName()}
+ */
+ @Schema(description = "选中的设备名字数组", requiredMode = REQUIRED, example = "[设备1,设备2,设备3,设备4]")
+ private List deviceNames;
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/convert/ota/IotOtaUpgradeRecordConvert.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/convert/ota/IotOtaUpgradeRecordConvert.java
new file mode 100644
index 0000000000..2da9315f7d
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/convert/ota/IotOtaUpgradeRecordConvert.java
@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.iot.convert.ota;
+
+import cn.hutool.core.convert.Convert;
+import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.ota.IotOtaFirmwareDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.ota.IotOtaUpgradeTaskDO;
+import cn.iocoder.yudao.module.iot.enums.ota.IotOtaUpgradeRecordStatusEnum;
+import cn.iocoder.yudao.module.iot.service.ota.bo.IotOtaUpgradeRecordCreateReqBO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+@Mapper
+public interface IotOtaUpgradeRecordConvert {
+
+ IotOtaUpgradeRecordConvert INSTANCE = Mappers.getMapper(IotOtaUpgradeRecordConvert.class);
+
+ // TODO @li：一般情况下，这种 convert 直接写 service 就好啦。不用特别写一个哈
+ default List convertBOList(IotOtaUpgradeTaskDO upgradeTask, IotOtaFirmwareDO firmware, List deviceList) {
+ return deviceList.stream().map(device -> {
+ IotOtaUpgradeRecordCreateReqBO createReqBO = new IotOtaUpgradeRecordCreateReqBO();
+ createReqBO.setFirmwareId(firmware.getId());
+ createReqBO.setTaskId(upgradeTask.getId());
+ createReqBO.setProductKey(device.getProductKey());
+ createReqBO.setDeviceName(device.getDeviceName());
+ createReqBO.setDeviceId(Convert.toStr(device.getId()));
+ createReqBO.setFromFirmwareId(Convert.toLong(device.getFirmwareId()));
+ createReqBO.setStatus(IotOtaUpgradeRecordStatusEnum.PENDING.getStatus());
+ createReqBO.setProgress(0);
+ return createReqBO;
+ }).toList();
+ }
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/ota/IotOtaUpgradeTaskDO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/ota/IotOtaUpgradeTaskDO.java
index 7d9e4425db..e98e6c15c2 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/ota/IotOtaUpgradeTaskDO.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/ota/IotOtaUpgradeTaskDO.java
@@ -41,30 +41,43 @@ public class IotOtaUpgradeTaskDO extends BaseDO {
/**
* 固件编号
- *
+ *
* 关联 {@link IotOtaFirmwareDO#getId()}
*/
private Long firmwareId;
/**
* 任务状态
- *
+ *
* 关联 {@link cn.iocoder.yudao.module.iot.enums.ota.IotOtaUpgradeTaskStatusEnum}
*/
private Integer status;
/**
* 升级范围
- *
+ *
* 关联 {@link cn.iocoder.yudao.module.iot.enums.ota.IotOtaUpgradeTaskScopeEnum}
*/
private Integer scope;
+ /**
+ * 设备数量
+ */
+ private Long deviceCount;
+ /**
+ * 选中的设备编号数组
+ *
+ * 关联 {@link IotDeviceDO#getId()}
+ */
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private List deviceIds;
+
+ // TODO @li：这个通过查询，不用冗余
/**
* 选中的设备名字数组
- *
+ *
* 关联 {@link IotDeviceDO#getDeviceName()}
*/
@TableField(typeHandler = JacksonTypeHandler.class)
private List deviceNames;
-}
\ No newline at end of file
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/IotDeviceMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/IotDeviceMapper.java
index e57eb8f7c0..0f642541ef 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/IotDeviceMapper.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/IotDeviceMapper.java
@@ -61,10 +61,13 @@ public interface IotDeviceMapper extends BaseMapperX {
return selectList(IotDeviceDO::getState, state);
}
+ default List selectListByProductId(Long productId) {
+ return selectList(IotDeviceDO::getProductId, productId);
+ }
+
default Long selectCountByGroupId(Long groupId) {
return selectCount(new LambdaQueryWrapperX()
- .apply("FIND_IN_SET(" + groupId + ",group_ids) > 0")
- .orderByDesc(IotDeviceDO::getId));
+ .apply("FIND_IN_SET(" + groupId + ",group_ids) > 0"));
}
/**
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/ota/IotOtaFirmwareMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/ota/IotOtaFirmwareMapper.java
new file mode 100644
index 0000000000..9bd4619164
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/ota/IotOtaFirmwareMapper.java
@@ -0,0 +1,45 @@
+package cn.iocoder.yudao.module.iot.dal.mysql.ota;
+
+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.ota.vo.firmware.IotOtaFirmwarePageReqVO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.ota.IotOtaFirmwareDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+// TODO @li：这里的注释，可以去掉哈，多了点点
+/**
+ * IotOtaFirmwareMapper 接口用于操作 IotOtaFirmwareDO 实体类对应的数据库表。
+ * 该接口继承自 BaseMapperX，提供了基本的 CRUD 操作，并扩展了特定查询方法。
+ */
+@Mapper
+public interface IotOtaFirmwareMapper extends BaseMapperX {
+
+ /**
+ * 根据产品ID和固件版本号查询固件信息列表。
+ *
+ * @param productId 产品ID，用于筛选固件信息。
+ * @param version 固件版本号，用于筛选固件信息。
+ * @return 返回符合条件的固件信息列表。
+ */
+ default List selectByProductIdAndVersion(String productId, String version) {
+ return selectList(IotOtaFirmwareDO::getProductId, productId,
+ IotOtaFirmwareDO::getVersion, version);
+ }
+
+ /**
+ * 分页查询固件信息，支持根据名称和产品ID进行筛选，并按创建时间降序排列。
+ *
+ * @param pageReqVO 分页查询请求对象，包含分页参数和筛选条件。
+ * @return 返回分页查询结果，包含符合条件的固件信息列表。
+ */
+ default PageResult selectPage(IotOtaFirmwarePageReqVO pageReqVO) {
+ return selectPage(pageReqVO, new LambdaQueryWrapperX()
+ .likeIfPresent(IotOtaFirmwareDO::getName, pageReqVO.getName())
+ .eqIfPresent(IotOtaFirmwareDO::getProductId, pageReqVO.getProductId())
+ .orderByDesc(IotOtaFirmwareDO::getCreateTime));
+ }
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/ota/IotOtaUpgradeRecordMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/ota/IotOtaUpgradeRecordMapper.java
new file mode 100644
index 0000000000..35a164ca2c
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/ota/IotOtaUpgradeRecordMapper.java
@@ -0,0 +1,135 @@
+package cn.iocoder.yudao.module.iot.dal.mysql.ota;
+
+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.ota.vo.upgrade.record.IotOtaUpgradeRecordPageReqVO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.ota.IotOtaUpgradeRecordDO;
+import cn.iocoder.yudao.module.iot.enums.ota.IotOtaUpgradeRecordStatusEnum;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+// TODO @li：这里的注释，可以去掉哈，多了点点
+/**
+ * OTA 升级记录 Mapper 接口
+ */
+@Mapper
+public interface IotOtaUpgradeRecordMapper extends BaseMapperX {
+
+ /**
+ * 根据条件查询单个OTA升级记录
+ *
+ * @param firmwareId 固件ID，可选参数，用于筛选固件ID匹配的记录
+ * @param taskId 任务ID，可选参数，用于筛选任务ID匹配的记录
+ * @param deviceId 设备ID，可选参数，用于筛选设备ID匹配的记录
+ * @return 返回符合条件的单个OTA升级记录，如果不存在则返回null
+ */
+ default IotOtaUpgradeRecordDO selectByConditions(Long firmwareId, Long taskId, String deviceId) {
+ // 使用LambdaQueryWrapperX构建查询条件，根据传入的参数动态添加查询条件
+ return selectOne(new LambdaQueryWrapperX()
+ .eqIfPresent(IotOtaUpgradeRecordDO::getFirmwareId, firmwareId)
+ .eqIfPresent(IotOtaUpgradeRecordDO::getTaskId, taskId)
+ .eqIfPresent(IotOtaUpgradeRecordDO::getDeviceId, deviceId));
+ }
+
+ /**
+ * 获取OTA升级记录的数量
+ *
+ * @param taskId 任务ID，用于筛选特定任务的升级记录
+ * @param deviceName 设备名称，用于筛选特定设备的升级记录
+ * @param status 状态，用于筛选特定状态的升级记录
+ * @return 返回符合条件的OTA升级记录的数量
+ */
+ Long getOtaUpgradeRecordCount(@Param("taskId") Long taskId,
+ @Param("deviceName") String deviceName,
+ @Param("status") Integer status);
+
+ /**
+ * 获取OTA升级记录的统计信息
+ *
+ * @param firmwareId 固件ID，用于筛选特定固件的升级记录
+ * @param status 状态，用于筛选特定状态的升级记录
+ * @return 返回符合条件的OTA升级记录的统计信息
+ */
+ Long getOtaUpgradeRecordStatistics(@Param("firmwareId") Long firmwareId,
+ @Param("status") Integer status);
+
+
+ /**
+ * 根据分页查询条件获取IOT OTA升级记录的分页结果
+ *
+ * @param pageReqVO 分页查询请求参数，包含设备名称、任务ID等查询条件
+ * @return 返回分页查询结果，包含符合条件的IOT OTA升级记录列表
+ */
+ default PageResult selectUpgradeRecordPage(IotOtaUpgradeRecordPageReqVO pageReqVO) {
+ // 使用LambdaQueryWrapperX构建查询条件，并根据请求参数动态添加查询条件
+ return selectPage(pageReqVO, new LambdaQueryWrapperX()
+ .likeIfPresent(IotOtaUpgradeRecordDO::getDeviceName, pageReqVO.getDeviceName()) // 如果设备名称存在，则添加模糊查询条件
+ .eqIfPresent(IotOtaUpgradeRecordDO::getTaskId, pageReqVO.getTaskId())); // 如果任务ID存在，则添加等值查询条件
+ }
+
+ /**
+ * 根据任务ID取消升级记录。
+ * 该方法通过任务ID查找状态为“待处理”的升级记录，并将其状态更新为“已取消”。
+ *
+ * @param taskId 任务ID，用于查找对应的升级记录。
+ */
+ default void cancelUpgradeRecordByTaskId(Long taskId) {
+ // 使用LambdaUpdateWrapper构建更新条件，将状态为“待处理”的记录更新为“已取消”
+ // TODO @li：哪些可以更新，通过 service 传递。mapper 尽量不要有逻辑
+ update(new LambdaUpdateWrapper()
+ .set(IotOtaUpgradeRecordDO::getStatus, IotOtaUpgradeRecordStatusEnum.CANCELED.getStatus())
+ .eq(IotOtaUpgradeRecordDO::getTaskId, taskId)
+ .eq(IotOtaUpgradeRecordDO::getStatus, IotOtaUpgradeRecordStatusEnum.PENDING.getStatus())
+ );
+ }
+
+ /**
+ * 根据状态查询符合条件的升级记录列表
+ *
+ * 该函数使用LambdaQueryWrapperX构建查询条件，查询指定状态的升级记录。
+ *
+ * @param state 升级记录的状态，用于筛选符合条件的记录
+ * @return 返回符合指定状态的升级记录列表，类型为List
+ */
+ default List selectUpgradeRecordListByState(Integer state) {
+ // 使用LambdaQueryWrapperX构建查询条件，根据状态查询符合条件的升级记录
+ return selectList(new LambdaQueryWrapperX()
+ .eq(IotOtaUpgradeRecordDO::getStatus, state));
+ }
+
+ /**
+ * 更新升级记录状态
+ *
+ * 该函数用于批量更新指定ID列表中的升级记录状态。通过传入的ID列表和状态值，使用LambdaUpdateWrapper构建更新条件，
+ * 并执行更新操作。
+ *
+ * @param ids 需要更新的升级记录ID列表，类型为List。传入的ID列表中的记录将被更新。
+ * @param status 要更新的状态值，类型为Integer。该值将被设置到符合条件的升级记录中。
+ */
+ default void updateUpgradeRecordStatus(List ids, Integer status) {
+ // 使用LambdaUpdateWrapper构建更新条件，设置状态字段，并根据ID列表进行筛选
+ update(new LambdaUpdateWrapper()
+ .set(IotOtaUpgradeRecordDO::getStatus, status)
+ .in(IotOtaUpgradeRecordDO::getId, ids)
+ );
+ }
+
+ /**
+ * 根据任务ID查询升级记录列表
+ *
+ * 该函数通过任务ID查询符合条件的升级记录，并返回查询结果列表。
+ *
+ * @param taskId 任务ID，用于筛选升级记录
+ * @return 返回符合条件的升级记录列表，若未找到则返回空列表
+ */
+ default List selectUpgradeRecordListByTaskId(Long taskId) {
+ // 使用LambdaQueryWrapperX构建查询条件，根据任务ID查询符合条件的升级记录
+ return selectList(new LambdaQueryWrapperX()
+ .eq(IotOtaUpgradeRecordDO::getTaskId, taskId));
+ }
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/ota/IotOtaUpgradeTaskMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/ota/IotOtaUpgradeTaskMapper.java
new file mode 100644
index 0000000000..80c3ff5654
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/ota/IotOtaUpgradeTaskMapper.java
@@ -0,0 +1,58 @@
+package cn.iocoder.yudao.module.iot.dal.mysql.ota;
+
+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.ota.vo.upgrade.task.IotOtaUpgradeTaskPageReqVO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.ota.IotOtaUpgradeTaskDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+// TODO @li：这里的注释，可以去掉哈，多了点点
+/**
+ * IotOtaUpgradeTaskMapper 接口用于操作 IotOtaUpgradeTaskDO 数据库表。
+ * 该接口继承自 BaseMapperX，提供了基本的数据库操作方法。
+ */
+@Mapper
+public interface IotOtaUpgradeTaskMapper extends BaseMapperX {
+
+ /**
+ * 根据固件ID和任务名称查询升级任务列表。
+ *
+ * @param firmwareId 固件ID，用于筛选升级任务
+ * @param name 任务名称，用于筛选升级任务
+ * @return 符合条件的升级任务列表
+ */
+ default List selectByFirmwareIdAndName(Long firmwareId, String name) {
+ return selectList(new LambdaQueryWrapperX()
+ .eqIfPresent(IotOtaUpgradeTaskDO::getFirmwareId, firmwareId)
+ .eqIfPresent(IotOtaUpgradeTaskDO::getName, name));
+ }
+
+ /**
+ * 分页查询升级任务列表，支持根据固件ID和任务名称进行筛选。
+ *
+ * @param pageReqVO 分页查询请求对象，包含分页参数和筛选条件
+ * @return 分页结果，包含符合条件的升级任务列表
+ */
+ default PageResult selectUpgradeTaskPage(IotOtaUpgradeTaskPageReqVO pageReqVO) {
+ return selectPage(pageReqVO, new LambdaQueryWrapperX()
+ .eqIfPresent(IotOtaUpgradeTaskDO::getFirmwareId, pageReqVO.getFirmwareId())
+ .likeIfPresent(IotOtaUpgradeTaskDO::getName, pageReqVO.getName()));
+ }
+
+ /**
+ * 根据任务状态查询升级任务列表
+ *
+ * 该函数通过传入的任务状态，查询数据库中符合条件的升级任务列表。
+ *
+ * @param status 任务状态，用于筛选升级任务的状态值
+ * @return 返回符合条件的升级任务列表，列表中的每个元素为 IotOtaUpgradeTaskDO 对象
+ */
+ default List selectUpgradeTaskByState(Integer status) {
+ return selectList(IotOtaUpgradeTaskDO::getStatus, status);
+ }
+
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/job/ota/IotOtaUpgradeRecordJob.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/job/ota/IotOtaUpgradeRecordJob.java
new file mode 100644
index 0000000000..86c44db8b5
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/job/ota/IotOtaUpgradeRecordJob.java
@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.iot.job.ota;
+
+import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
+import cn.iocoder.yudao.framework.tenant.core.job.TenantJob;
+import cn.iocoder.yudao.module.iot.dal.dataobject.ota.IotOtaUpgradeRecordDO;
+import cn.iocoder.yudao.module.iot.enums.ota.IotOtaUpgradeRecordStatusEnum;
+import cn.iocoder.yudao.module.iot.service.ota.IotOtaUpgradeRecordService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class IotOtaUpgradeRecordJob implements JobHandler {
+
+ @Resource
+ private IotOtaUpgradeRecordService upgradeRecordService;
+
+ @Override
+ @TenantJob
+ public String execute(String param) throws Exception {
+ // 1. 查询待处理的升级记录
+ List upgradeRecords = upgradeRecordService
+ .getUpgradeRecordListByState(IotOtaUpgradeRecordStatusEnum.PENDING.getStatus());
+
+ // TODO @芋艿 2.执行升级动作
+ // TODO @li：应该是逐条 push，逐条更新。不用批量哈
+
+ // 3. 最终，更新升级记录状态
+ List ids = upgradeRecords.stream().map(IotOtaUpgradeRecordDO::getId).toList();
+ upgradeRecordService.updateUpgradeRecordStatus(ids, IotOtaUpgradeRecordStatusEnum.PUSHED.getStatus());
+ return "";
+ }
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/job/ota/IotOtaUpgradeTaskJob.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/job/ota/IotOtaUpgradeTaskJob.java
new file mode 100644
index 0000000000..5465161f98
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/job/ota/IotOtaUpgradeTaskJob.java
@@ -0,0 +1,72 @@
+package cn.iocoder.yudao.module.iot.job.ota;
+
+import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
+import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
+import cn.iocoder.yudao.framework.tenant.core.job.TenantJob;
+import cn.iocoder.yudao.module.iot.dal.dataobject.ota.IotOtaUpgradeRecordDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.ota.IotOtaUpgradeTaskDO;
+import cn.iocoder.yudao.module.iot.enums.ota.IotOtaUpgradeRecordStatusEnum;
+import cn.iocoder.yudao.module.iot.enums.ota.IotOtaUpgradeTaskStatusEnum;
+import cn.iocoder.yudao.module.iot.service.ota.IotOtaUpgradeRecordService;
+import cn.iocoder.yudao.module.iot.service.ota.IotOtaUpgradeTaskService;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+// TODO @li：也不用通过 job 去统计。可以通过 record update status 后，主动去更新 task 的状态。
+@Slf4j
+@Component
+public class IotOtaUpgradeTaskJob implements JobHandler {
+
+ @Resource
+ private IotOtaUpgradeTaskService upgradeTaskService;
+ @Resource
+ private IotOtaUpgradeRecordService upgradeRecordService;
+
+ @Override
+ @TenantJob
+ public String execute(String param) throws Exception {
+ // 1.这个任务主要是为了检查并更新升级任务的状态
+ List upgradeTasks = upgradeTaskService
+ .getUpgradeTaskByState(IotOtaUpgradeTaskStatusEnum.IN_PROGRESS.getStatus());
+ // 2.遍历并且确定升级任务的状态
+ upgradeTasks.forEach(this::checkUpgradeTaskState);
+ // TODO @芋艿: 其他的一些业务逻辑
+ return "";
+ }
+
+ private void checkUpgradeTaskState(IotOtaUpgradeTaskDO upgradeTask) {
+ // 1.查询任务所有的升级记录
+ List upgradeRecords =
+ upgradeRecordService.getUpgradeRecordListByTaskId(upgradeTask.getId());
+ if (upgradeRecords.stream().anyMatch(upgradeRecord ->
+ ObjectUtils.equalsAny(upgradeRecord.getStatus(),
+ IotOtaUpgradeRecordStatusEnum.PENDING.getStatus(),
+ IotOtaUpgradeRecordStatusEnum.PUSHED.getStatus(),
+ IotOtaUpgradeRecordStatusEnum.UPGRADING.getStatus()))) {
+ // 如果存在正在升级的升级记录，则升级任务的状态为进行中
+ log.debug("升级任务 {} 状态为进行中", upgradeTask.getId());
+ } else if (upgradeRecords.stream().allMatch(upgradeRecord ->
+ ObjectUtils.equalsAny(upgradeRecord.getStatus(),
+ IotOtaUpgradeRecordStatusEnum.SUCCESS.getStatus()))) {
+ // 如果全部升级成功，则升级任务的状态为已完成
+ upgradeTaskService.updateUpgradeTaskStatus(upgradeTask.getId(),
+ IotOtaUpgradeTaskStatusEnum.COMPLETED.getStatus());
+ } else if (upgradeRecords.stream().noneMatch(upgradeRecord ->
+ ObjectUtils.equalsAny(upgradeRecord.getStatus(),
+ IotOtaUpgradeRecordStatusEnum.PENDING.getStatus(),
+ IotOtaUpgradeRecordStatusEnum.PUSHED.getStatus(),
+ IotOtaUpgradeRecordStatusEnum.UPGRADING.getStatus())) &&
+ upgradeRecords.stream().anyMatch(upgradeRecord ->
+ ObjectUtils.equalsAny(upgradeRecord.getStatus(),
+ IotOtaUpgradeRecordStatusEnum.FAILURE.getStatus(),
+ IotOtaUpgradeRecordStatusEnum.CANCELED.getStatus()))) {
+ // 如果全部升级完毕，但是存在升级失败或者取消的升级记录，则升级任务的状态为失败
+ upgradeTaskService.updateUpgradeTaskStatus(upgradeTask.getId(),
+ IotOtaUpgradeTaskStatusEnum.INCOMPLETE.getStatus());
+ }
+ }
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceService.java
index fff1368c62..91a9ca96a3 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceService.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceService.java
@@ -35,8 +35,8 @@ public interface IotDeviceService {
* @return 设备
*/
IotDeviceDO createDevice(@NotEmpty(message = "产品标识不能为空") String productKey,
- @NotEmpty(message = "设备名称不能为空") String deviceName,
- Long gatewayId);
+ @NotEmpty(message = "设备名称不能为空") String deviceName,
+ Long gatewayId);
/**
* 更新设备
@@ -46,6 +46,7 @@ public interface IotDeviceService {
void updateDevice(@Valid IotDeviceSaveReqVO updateReqVO);
// TODO @芋艿：先这么实现。未来看情况，要不要自己实现
+
/**
* 更新设备的所属网关
*
@@ -110,7 +111,7 @@ public interface IotDeviceService {
IotDeviceDO getDeviceByDeviceKey(String deviceKey);
/**
- * 获得设备分页
+ * ��得设备分页
*
* @param pageReqVO 分页查询
* @return IoT 设备分页
@@ -151,7 +152,7 @@ public interface IotDeviceService {
/**
* 【缓存】根据产品 key 和设备名称，获得设备信息
- *
+ *
* 注意：该方法会忽略租户信息，所以调用时，需要确认会不会有跨租户访问的风险！！！
*
* @param productKey 产品 key
@@ -192,4 +193,12 @@ public interface IotDeviceService {
*/
List getDeviceList();
+ /**
+ * 获取 MQTT 连接参数
+ *
+ * @param deviceId 设备 ID
+ * @return MQTT 连接参数
+ */
+ IotDeviceMqttConnectionParamsRespVO getMqttConnectionParams(Long deviceId);
+
}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java
index 52766d37ab..28925cd9dd 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java
@@ -20,6 +20,8 @@ import cn.iocoder.yudao.module.iot.dal.redis.RedisKeyConstants;
import cn.iocoder.yudao.module.iot.enums.device.IotDeviceStateEnum;
import cn.iocoder.yudao.module.iot.enums.product.IotProductDeviceTypeEnum;
import cn.iocoder.yudao.module.iot.service.product.IotProductService;
+import cn.iocoder.yudao.module.iot.util.MqttSignUtils;
+import cn.iocoder.yudao.module.iot.util.MqttSignUtils.MqttSignResult;
import jakarta.annotation.Resource;
import jakarta.validation.ConstraintViolationException;
import lombok.extern.slf4j.Slf4j;
@@ -99,7 +101,7 @@ public class IotDeviceServiceImpl implements IotDeviceService {
}
private void validateCreateDeviceParam(String productKey, String deviceName, String deviceKey,
- Long gatewayId, IotProductDO product) {
+ Long gatewayId, IotProductDO product) {
TenantUtils.executeIgnore(() -> {
// 校验设备名称在同一产品下是否唯一
if (deviceMapper.selectByProductKeyAndDeviceName(productKey, deviceName) != null) {
@@ -121,12 +123,8 @@ public class IotDeviceServiceImpl implements IotDeviceService {
private void initDevice(IotDeviceDO device, IotProductDO product) {
device.setProductId(product.getId()).setProductKey(product.getProductKey())
.setDeviceType(product.getDeviceType());
- // 生成并设置必要的字段
- // TODO @芋艿：各种 mqtt 是不是可以简化！
- device.setDeviceSecret(generateDeviceSecret())
- .setMqttClientId(generateMqttClientId())
- .setMqttUsername(generateMqttUsername(device.getDeviceName(), device.getProductKey()))
- .setMqttPassword(generateMqttPassword());
+ // 生成密钥
+ device.setDeviceSecret(generateDeviceSecret());
// 设置设备状态为未激活
device.setState(IotDeviceStateEnum.INACTIVE.getState());
}
@@ -261,6 +259,16 @@ public class IotDeviceServiceImpl implements IotDeviceService {
return deviceMapper.selectListByState(state);
}
+ @Override
+ public List getDeviceListByProductId(Long productId) {
+ return deviceMapper.selectListByProductId(productId);
+ }
+
+ @Override
+ public List getDeviceListByIdList(List deviceIdList) {
+ return deviceMapper.selectByIds(deviceIdList);
+ }
+
@Override
public void updateDeviceState(Long id, Integer state) {
// 1. 校验存在
@@ -318,35 +326,6 @@ public class IotDeviceServiceImpl implements IotDeviceService {
return IdUtil.fastSimpleUUID();
}
- /**
- * 生成 MQTT Client ID
- *
- * @return 生成的 MQTT Client ID
- */
- private String generateMqttClientId() {
- return IdUtil.fastSimpleUUID();
- }
-
- /**
- * 生成 MQTT Username
- *
- * @param deviceName 设备名称
- * @param productKey 产品 Key
- * @return 生成的 MQTT Username
- */
- private String generateMqttUsername(String deviceName, String productKey) {
- return deviceName + "&" + productKey;
- }
-
- /**
- * 生成 MQTT Password
- *
- * @return 生成的 MQTT Password
- */
- private String generateMqttPassword() {
- return RandomUtil.randomString(32);
- }
-
@Override
@Transactional(rollbackFor = Exception.class) // 添加事务，异常则回滚所有导入
public IotDeviceImportRespVO importDevice(List importDevices, boolean updateSupport) {
@@ -417,6 +396,17 @@ public class IotDeviceServiceImpl implements IotDeviceService {
return respVO;
}
+ @Override
+ public IotDeviceMqttConnectionParamsRespVO getMqttConnectionParams(Long deviceId) {
+ IotDeviceDO device = validateDeviceExists(deviceId);
+ MqttSignResult mqttSignResult = MqttSignUtils.calculate(device.getProductKey(), device.getDeviceName(),
+ device.getDeviceSecret());
+ return new IotDeviceMqttConnectionParamsRespVO()
+ .setMqttClientId(mqttSignResult.getClientId())
+ .setMqttUsername(mqttSignResult.getUsername())
+ .setMqttPassword(mqttSignResult.getPassword());
+ }
+
private void deleteDeviceCache(IotDeviceDO device) {
// 保证 Spring AOP 触发
getSelf().deleteDeviceCache0(device);
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/control/IotDeviceUpstreamService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/control/IotDeviceUpstreamService.java
index 39b0d19c05..dba529df2c 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/control/IotDeviceUpstreamService.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/control/IotDeviceUpstreamService.java
@@ -62,4 +62,11 @@ public interface IotDeviceUpstreamService {
*/
void addDeviceTopology(IotDeviceTopologyAddReqDTO addReqDTO);
+ /**
+ * Emqx 连接认证
+ *
+ * @param authReqDTO Emqx 连接认证 DTO
+ */
+ boolean authenticateEmqxConnection(IotDeviceEmqxAuthReqDTO authReqDTO);
+
}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/control/IotDeviceUpstreamServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/control/IotDeviceUpstreamServiceImpl.java
index ad065f930e..29e8096a95 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/control/IotDeviceUpstreamServiceImpl.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/control/IotDeviceUpstreamServiceImpl.java
@@ -20,6 +20,8 @@ import cn.iocoder.yudao.module.iot.mq.producer.device.IotDeviceProducer;
import cn.iocoder.yudao.module.iot.service.device.IotDeviceService;
import cn.iocoder.yudao.module.iot.service.device.data.IotDevicePropertyService;
import cn.iocoder.yudao.module.iot.service.plugin.IotPluginInstanceService;
+import cn.iocoder.yudao.module.iot.util.MqttSignUtils;
+import cn.iocoder.yudao.module.iot.util.MqttSignUtils.MqttSignResult;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -58,25 +60,26 @@ public class IotDeviceUpstreamServiceImpl implements IotDeviceUpstreamService {
// 2.1 情况一：属性上报
String requestId = IdUtil.fastSimpleUUID();
if (Objects.equals(simulatorReqVO.getType(), IotDeviceMessageTypeEnum.PROPERTY.getType())) {
- reportDeviceProperty(((IotDevicePropertyReportReqDTO)
- new IotDevicePropertyReportReqDTO().setRequestId(requestId).setReportTime(LocalDateTime.now())
- .setProductKey(device.getProductKey()).setDeviceName(device.getDeviceName()))
+ reportDeviceProperty(((IotDevicePropertyReportReqDTO) new IotDevicePropertyReportReqDTO()
+ .setRequestId(requestId).setReportTime(LocalDateTime.now())
+ .setProductKey(device.getProductKey()).setDeviceName(device.getDeviceName()))
.setProperties((Map) simulatorReqVO.getData()));
return;
}
// 2.2 情况二：事件上报
if (Objects.equals(simulatorReqVO.getType(), IotDeviceMessageTypeEnum.EVENT.getType())) {
- reportDeviceEvent(((IotDeviceEventReportReqDTO)
- new IotDeviceEventReportReqDTO().setRequestId(requestId).setReportTime(LocalDateTime.now())
- .setProductKey(device.getProductKey()).setDeviceName(device.getDeviceName()))
- .setIdentifier(simulatorReqVO.getIdentifier()).setParams((Map) simulatorReqVO.getData()));
+ reportDeviceEvent(((IotDeviceEventReportReqDTO) new IotDeviceEventReportReqDTO().setRequestId(requestId)
+ .setReportTime(LocalDateTime.now())
+ .setProductKey(device.getProductKey()).setDeviceName(device.getDeviceName()))
+ .setIdentifier(simulatorReqVO.getIdentifier())
+ .setParams((Map) simulatorReqVO.getData()));
return;
}
// 2.3 情况三：状态变更
if (Objects.equals(simulatorReqVO.getType(), IotDeviceMessageTypeEnum.STATE.getType())) {
- updateDeviceState(((IotDeviceStateUpdateReqDTO)
- new IotDeviceStateUpdateReqDTO().setRequestId(IdUtil.fastSimpleUUID()).setReportTime(LocalDateTime.now())
- .setProductKey(device.getProductKey()).setDeviceName(device.getDeviceName()))
+ updateDeviceState(((IotDeviceStateUpdateReqDTO) new IotDeviceStateUpdateReqDTO()
+ .setRequestId(IdUtil.fastSimpleUUID()).setReportTime(LocalDateTime.now())
+ .setProductKey(device.getProductKey()).setDeviceName(device.getDeviceName()))
.setState((Integer) simulatorReqVO.getData()));
return;
}
@@ -171,7 +174,7 @@ public class IotDeviceUpstreamServiceImpl implements IotDeviceUpstreamService {
}
private void registerDevice0(String productKey, String deviceName, Long gatewayId,
- IotDeviceUpstreamAbstractReqDTO registerReqDTO) {
+ IotDeviceUpstreamAbstractReqDTO registerReqDTO) {
// 1.1 注册设备
IotDeviceDO device = deviceService.getDeviceByProductKeyAndDeviceNameFromCache(productKey, deviceName);
boolean registerNew = device == null;
@@ -277,6 +280,37 @@ public class IotDeviceUpstreamServiceImpl implements IotDeviceUpstreamService {
sendDeviceMessage(message, device);
}
+ @Override
+ public boolean authenticateEmqxConnection(IotDeviceEmqxAuthReqDTO authReqDTO) {
+ log.info("[authenticateEmqxConnection][认证 Emqx 连接: {}]", authReqDTO);
+ // 1. 校验设备是否存在
+ // username 格式：${DeviceName}&${ProductKey}
+ String[] usernameParts = authReqDTO.getUsername().split("&");
+ if (usernameParts.length != 2) {
+ log.error("[authenticateEmqxConnection][认证失败，username 格式不正确]");
+ return false;
+ }
+ String deviceName = usernameParts[0];
+ String productKey = usernameParts[1];
+ IotDeviceDO device = deviceService.getDeviceByProductKeyAndDeviceNameFromCache(
+ productKey, deviceName);
+ if (device == null) {
+ log.error("[authenticateEmqxConnection][设备({}/{}) 不存在]",
+ productKey, deviceName);
+ return false;
+ }
+ // 2. 校验密码
+ String deviceSecret = device.getDeviceSecret();
+ String clientId = authReqDTO.getClientId();
+ MqttSignResult sign = MqttSignUtils.calculate(productKey, deviceName, deviceSecret, clientId);
+ if (StrUtil.equals(sign.getPassword(), authReqDTO.getPassword())) {
+ log.info("[authenticateEmqxConnection][认证成功]");
+ return true;
+ }
+ log.error("[authenticateEmqxConnection][认证失败，密码不正确]");
+ return false;
+ }
+
private void updateDeviceLastTime(IotDeviceDO device, IotDeviceUpstreamAbstractReqDTO reqDTO) {
// 1. 【异步】记录设备与插件实例的映射
pluginInstanceService.updateDevicePluginInstanceProcessIdAsync(device.getDeviceKey(), reqDTO.getProcessId());
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaFirmwareService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaFirmwareService.java
new file mode 100644
index 0000000000..67e14ce6a5
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaFirmwareService.java
@@ -0,0 +1,58 @@
+package cn.iocoder.yudao.module.iot.service.ota;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.iot.controller.admin.ota.vo.firmware.IotOtaFirmwareCreateReqVO;
+import cn.iocoder.yudao.module.iot.controller.admin.ota.vo.firmware.IotOtaFirmwarePageReqVO;
+import cn.iocoder.yudao.module.iot.controller.admin.ota.vo.firmware.IotOtaFirmwareUpdateReqVO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.ota.IotOtaFirmwareDO;
+import jakarta.validation.Valid;
+
+// TODO @li：类、方法注释有点冗余，可以参考别的模块哈
+/**
+ * OTA固件管理服务接口
+ * 提供OTA固件的创建、更新和查询等功能
+ */
+public interface IotOtaFirmwareService {
+
+ /**
+ * 创建OTA固件
+ *
+ * @param saveReqVO OTA固件保存请求对象，包含固件的相关信息
+ * @return 返回新创建的固件的ID
+ */
+ Long createOtaFirmware(@Valid IotOtaFirmwareCreateReqVO saveReqVO);
+
+ /**
+ * 更新OTA固件信息
+ *
+ * @param updateReqVO OTA固件保存请求对象，包含需要更新的固件信息
+ */
+ void updateOtaFirmware(@Valid IotOtaFirmwareUpdateReqVO updateReqVO);
+
+ /**
+ * 根据ID获取OTA固件信息
+ *
+ * @param id OTA固件的唯一标识符
+ * @return 返回OTA固件的详细信息对象
+ */
+ IotOtaFirmwareDO getOtaFirmware(Long id);
+
+ /**
+ * 分页查询OTA固件信息
+ *
+ * @param pageReqVO 包含分页查询条件的请求对象
+ * @return 返回分页查询结果，包含固件信息列表和分页信息
+ */
+ PageResult getOtaFirmwarePage(@Valid IotOtaFirmwarePageReqVO pageReqVO);
+
+ /**
+ * 验证物联网OTA固件是否存在
+ *
+ * @param id 固件的唯一标识符
+ * 该方法用于检查系统中是否存在与给定ID关联的物联网OTA固件信息
+ * 主要目的是在进行固件更新操作前，确保目标固件已经存在并可以被访问
+ * 如果固件不存在，该方法可能抛出异常或返回错误信息，具体行为未定义
+ */
+ IotOtaFirmwareDO validateFirmwareExists(Long id);
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaFirmwareServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaFirmwareServiceImpl.java
new file mode 100644
index 0000000000..56a830b915
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaFirmwareServiceImpl.java
@@ -0,0 +1,93 @@
+package cn.iocoder.yudao.module.iot.service.ota;
+
+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.ota.vo.firmware.IotOtaFirmwareCreateReqVO;
+import cn.iocoder.yudao.module.iot.controller.admin.ota.vo.firmware.IotOtaFirmwarePageReqVO;
+import cn.iocoder.yudao.module.iot.controller.admin.ota.vo.firmware.IotOtaFirmwareUpdateReqVO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.ota.IotOtaFirmwareDO;
+import cn.iocoder.yudao.module.iot.dal.mysql.ota.IotOtaFirmwareMapper;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
+import java.util.Objects;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.OTA_FIRMWARE_NOT_EXISTS;
+import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.OTA_FIRMWARE_PRODUCT_VERSION_DUPLICATE;
+
+@Slf4j
+@Service
+@Validated
+public class IotOtaFirmwareServiceImpl implements IotOtaFirmwareService {
+
+ @Resource
+ private IotOtaFirmwareMapper otaFirmwareMapper;
+
+ @Override
+ public Long createOtaFirmware(IotOtaFirmwareCreateReqVO saveReqVO) {
+ // 1. 校验固件产品 + 版本号不能重复
+ // TODO @li：需要考虑设备也存在
+ validateProductAndVersionDuplicate(saveReqVO.getProductId(), saveReqVO.getVersion());
+
+ // 2.转化数据格式，准备存储到数据库中
+ IotOtaFirmwareDO firmware = BeanUtils.toBean(saveReqVO, IotOtaFirmwareDO.class);
+ otaFirmwareMapper.insert(firmware);
+ return firmware.getId();
+ }
+
+ @Override
+ public void updateOtaFirmware(IotOtaFirmwareUpdateReqVO updateReqVO) {
+ // TODO @li：如果序号只有一个，直接写 1. 更好哈
+ // 1.1. 校验存在
+ validateFirmwareExists(updateReqVO.getId());
+
+ // 2. 更新数据
+ IotOtaFirmwareDO updateObj = BeanUtils.toBean(updateReqVO, IotOtaFirmwareDO.class);
+ otaFirmwareMapper.updateById(updateObj);
+ }
+
+ @Override
+ public IotOtaFirmwareDO getOtaFirmware(Long id) {
+ return otaFirmwareMapper.selectById(id);
+ }
+
+ @Override
+ public PageResult getOtaFirmwarePage(IotOtaFirmwarePageReqVO pageReqVO) {
+ return otaFirmwareMapper.selectPage(pageReqVO);
+ }
+
+ @Override
+ public IotOtaFirmwareDO validateFirmwareExists(Long id) {
+ IotOtaFirmwareDO firmware = otaFirmwareMapper.selectById(id);
+ if (firmware == null) {
+ throw exception(OTA_FIRMWARE_NOT_EXISTS);
+ }
+ return firmware;
+ }
+
+ /**
+ * 验证产品和版本号是否重复
+ *
+ * 该方法用于确保在系统中不存在具有相同产品ID和版本号的固件条目
+ * 它通过调用otaFirmwareMapper的selectByProductIdAndVersion方法来查询数据库中是否存在匹配的产品ID和版本号的固件信息
+ * 如果查询结果非空且不为null，则抛出异常，提示固件信息已存在，从而避免数据重复
+ *
+ * @param productId 产品ID，用于数据库查询
+ * @param version 版本号，用于数据库查询
+ * @throws cn.iocoder.yudao.framework.common.exception.ServiceException，则抛出异常，提示固件信息已存在
+ */
+ private void validateProductAndVersionDuplicate(String productId, String version) {
+ // 查询数据库中是否存在具有相同产品ID和版本号的固件信息
+ List list = otaFirmwareMapper.selectByProductIdAndVersion(productId, version);
+ // 如果查询结果非空且不为null，则抛出异常，提示固件信息已存在
+ // TODO @li：使用 isNotEmpty 这种 方法，简化
+ if (Objects.nonNull(list) && !list.isEmpty()) {
+ throw exception(OTA_FIRMWARE_PRODUCT_VERSION_DUPLICATE);
+ }
+ }
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaUpgradeRecordService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaUpgradeRecordService.java
new file mode 100644
index 0000000000..ea5de4a427
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaUpgradeRecordService.java
@@ -0,0 +1,114 @@
+package cn.iocoder.yudao.module.iot.service.ota;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.iot.controller.admin.ota.vo.upgrade.record.IotOtaUpgradeRecordPageReqVO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.ota.IotOtaUpgradeRecordDO;
+import cn.iocoder.yudao.module.iot.service.ota.bo.IotOtaUpgradeRecordCreateReqBO;
+import cn.iocoder.yudao.module.iot.service.ota.bo.IotOtaUpgradeRecordUpdateReqBO;
+import jakarta.validation.Valid;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * IotOtaUpgradeRecordService 接口定义了与物联网设备OTA升级记录相关的操作。
+ * 该接口提供了创建、更新、查询、统计和重试升级记录的功能。
+ */
+public interface IotOtaUpgradeRecordService {
+
+ // TODO @createOtaUpgradeRecordBatch 哈，需要补充方法里，缺少 Ota 关键字的
+
+ /**
+ * 批量创建物联网OTA升级记录
+ *
+ * 该函数用于处理一组物联网OTA升级记录的创建请求，并将这些记录批量保存到系统中。
+ *
+ * @param createList 包含多个物联网OTA升级记录创建请求的列表，每个请求对象都经过校验（@Valid注解确保）
+ * 列表中的每个元素都是IotOtaUpgradeRecordCreateReqBO类型的对象，表示一个独立的升级记录创建请求。
+ */
+ void createUpgradeRecordBatch(@Valid List createList);
+
+ // TODO @li：尽量避免写比较大的通用 update。而是根据场景提供，这样才能收敛
+ /**
+ * 更新现有的 OTA 升级记录
+ *
+ * @param updateReqBO 包含更新升级记录所需信息的请求对象，必须经过验证。
+ */
+ void updateUpgradeRecord(@Valid IotOtaUpgradeRecordUpdateReqBO updateReqBO);
+
+ /**
+ * 获取OTA升级记录的数量统计。
+ *
+ * @return 返回一个 Map，其中键为状态码，值为对应状态的升级记录数量
+ */
+ Map getOtaUpgradeRecordCount(@Valid IotOtaUpgradeRecordPageReqVO pageReqVO);
+
+ /**
+ * 获取 OTA 升级记录的统计信息。
+ *
+ * @return 返回一个 Map，其中键为状态码，值为对应状态的升级记录统计信息
+ */
+ Map getOtaUpgradeRecordStatistics(Long firmwareId);
+
+ /**
+ * 重试指定的OTA升级记录。
+ *
+ * @param id 需要重试的升级记录的ID。
+ */
+ void retryUpgradeRecord(Long id);
+
+ /**
+ * 获取指定ID的OTA升级记录的详细信息。
+ *
+ * @param id 需要查询的升级记录的ID。
+ * @return 返回包含升级记录详细信息的响应对象。
+ */
+ IotOtaUpgradeRecordDO getUpgradeRecord(Long id);
+
+ /**
+ * 分页查询OTA升级记录。
+ *
+ * @param pageReqVO 包含分页查询条件的请求对象，必须经过验证。
+ * @return 返回包含分页查询结果的响应对象。
+ */
+ PageResult getUpgradeRecordPage(@Valid IotOtaUpgradeRecordPageReqVO pageReqVO);
+
+ /**
+ * 根据任务ID取消升级记录。
+ *
+ * 该函数用于根据给定的任务ID，取消与该任务相关的升级记录。通常用于在任务执行失败或用户手动取消时，
+ * 清理或标记相关的升级记录为取消状态。
+ *
+ * @param taskId 要取消升级记录的任务ID。该ID唯一标识一个任务，通常由任务管理系统生成。
+ */
+ void cancelUpgradeRecordByTaskId(Long taskId);
+
+ /**
+ * 根据升级状态获取升级记录列表
+ *
+ * @param state 升级状态，用于筛选符合条件的升级记录
+ * @return 返回符合指定状态的升级记录列表，列表中的元素为 {@link IotOtaUpgradeRecordDO} 对象
+ */
+ List getUpgradeRecordListByState(Integer state);
+
+ /**
+ * 更新升级记录的状态。
+ *
+ * 该函数用于批量更新指定升级记录的状态。通过传入的ID列表和状态值，将对应的升级记录的状态更新为指定的值。
+ *
+ * @param ids 需要更新状态的升级记录的ID列表。列表中的每个元素代表一个升级记录的ID。
+ * @param status 要更新的状态值。该值应为有效的状态标识符，通常为整数类型。
+ */
+ void updateUpgradeRecordStatus(List ids, Integer status);
+
+ /**
+ * 根据任务ID获取升级记录列表
+ *
+ * 该函数通过给定的任务ID，查询并返回与该任务相关的所有升级记录。
+ *
+ * @param taskId 任务ID，用于指定需要查询的任务
+ * @return 返回一个包含升级记录的列表，列表中的每个元素为IotOtaUpgradeRecordDO对象
+ */
+ List getUpgradeRecordListByTaskId(Long taskId);
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaUpgradeRecordServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaUpgradeRecordServiceImpl.java
new file mode 100644
index 0000000000..ae2b682739
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaUpgradeRecordServiceImpl.java
@@ -0,0 +1,212 @@
+package cn.iocoder.yudao.module.iot.service.ota;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
+import cn.iocoder.yudao.module.iot.controller.admin.ota.vo.upgrade.record.IotOtaUpgradeRecordPageReqVO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.ota.IotOtaUpgradeRecordDO;
+import cn.iocoder.yudao.module.iot.dal.mysql.ota.IotOtaUpgradeRecordMapper;
+import cn.iocoder.yudao.module.iot.enums.ota.IotOtaUpgradeRecordStatusEnum;
+import cn.iocoder.yudao.module.iot.service.ota.bo.IotOtaUpgradeRecordCreateReqBO;
+import cn.iocoder.yudao.module.iot.service.ota.bo.IotOtaUpgradeRecordUpdateReqBO;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.*;
+
+@Slf4j
+@Service
+@Validated
+public class IotOtaUpgradeRecordServiceImpl implements IotOtaUpgradeRecordService {
+
+ @Resource
+ private IotOtaUpgradeRecordMapper upgradeRecordMapper;
+
+ @Override
+ public void createUpgradeRecordBatch(List createList) {
+ // 1. 批量校验参数信息
+ createList.forEach(saveBO -> validateUpgradeRecordDuplicate(saveBO.getFirmwareId(), saveBO.getTaskId(), saveBO.getDeviceId()));
+
+ // 2. 将数据批量存储到数据库里
+ List upgradeRecords = BeanUtils.toBean(createList, IotOtaUpgradeRecordDO.class);
+ upgradeRecordMapper.insertBatch(upgradeRecords);
+ }
+
+ @Override
+ @Transactional
+ public void updateUpgradeRecord(IotOtaUpgradeRecordUpdateReqBO updateReqBO) {
+ // 1. 校验升级记录信息是否存在
+ validateUpgradeRecordExists(updateReqBO.getId());
+
+ // 2. 将数据转化成数据库存储的格式
+ IotOtaUpgradeRecordDO updateRecord = BeanUtils.toBean(updateReqBO, IotOtaUpgradeRecordDO.class);
+ upgradeRecordMapper.updateById(updateRecord);
+ // TODO @芋艿: 更新升级记录触发的其他Action
+ }
+
+ /**
+ * 获取OTA升级记录的数量统计。
+ * 该方法根据传入的查询条件，统计不同状态的OTA升级记录数量，并返回一个包含各状态数量的映射。
+ *
+ * @param pageReqVO 包含查询条件的请求对象，主要包括任务ID和设备名称等信息。
+ * @return 返回一个Map，其中键为状态常量，值为对应状态的记录数量。
+ */
+ @Override
+ @Transactional
+ public Map getOtaUpgradeRecordCount(IotOtaUpgradeRecordPageReqVO pageReqVO) {
+ // 分别查询不同状态的OTA升级记录数量
+ // TODO @li: 通过 groupby 统计下；
+ Long pending = upgradeRecordMapper.getOtaUpgradeRecordCount(pageReqVO.getTaskId(), pageReqVO.getDeviceName(), IotOtaUpgradeRecordStatusEnum.PENDING.getStatus());
+ Long pushed = upgradeRecordMapper.getOtaUpgradeRecordCount(pageReqVO.getTaskId(), pageReqVO.getDeviceName(), IotOtaUpgradeRecordStatusEnum.PUSHED.getStatus());
+ Long upgrading = upgradeRecordMapper.getOtaUpgradeRecordCount(pageReqVO.getTaskId(), pageReqVO.getDeviceName(), IotOtaUpgradeRecordStatusEnum.UPGRADING.getStatus());
+ Long success = upgradeRecordMapper.getOtaUpgradeRecordCount(pageReqVO.getTaskId(), pageReqVO.getDeviceName(), IotOtaUpgradeRecordStatusEnum.SUCCESS.getStatus());
+ Long failure = upgradeRecordMapper.getOtaUpgradeRecordCount(pageReqVO.getTaskId(), pageReqVO.getDeviceName(), IotOtaUpgradeRecordStatusEnum.FAILURE.getStatus());
+ Long canceled = upgradeRecordMapper.getOtaUpgradeRecordCount(pageReqVO.getTaskId(), pageReqVO.getDeviceName(), IotOtaUpgradeRecordStatusEnum.CANCELED.getStatus());
+ // 将各状态的数量封装到Map中返回
+ // TODO @li：使用 MapUtil，因为 Map.of 是 jdk9 才有，后续不好同步到 master 的 jdk8；
+ return Map.of(IotOtaUpgradeRecordPageReqVO.PENDING, pending,
+ IotOtaUpgradeRecordPageReqVO.PUSHED, pushed,
+ IotOtaUpgradeRecordPageReqVO.UPGRADING, upgrading,
+ IotOtaUpgradeRecordPageReqVO.SUCCESS, success,
+ IotOtaUpgradeRecordPageReqVO.FAILURE, failure,
+ IotOtaUpgradeRecordPageReqVO.CANCELED, canceled);
+ }
+
+ /**
+ * 获取指定固件ID的OTA升级记录统计信息。
+ * 该方法通过查询数据库，统计不同状态的OTA升级记录数量，并返回一个包含各状态数量的映射。
+ *
+ * @param firmwareId 固件ID，用于指定需要统计的固件升级记录。
+ * @return 返回一个Map，其中键为升级记录状态（如PENDING、PUSHED等），值为对应状态的记录数量。
+ */
+ @Override
+ @Transactional
+ public Map getOtaUpgradeRecordStatistics(Long firmwareId) {
+ // 查询并统计不同状态的OTA升级记录数量
+ // TODO @li: 通过 groupby 统计下；
+ Long pending = upgradeRecordMapper.getOtaUpgradeRecordStatistics(firmwareId, IotOtaUpgradeRecordStatusEnum.PENDING.getStatus());
+ Long pushed = upgradeRecordMapper.getOtaUpgradeRecordStatistics(firmwareId, IotOtaUpgradeRecordStatusEnum.PUSHED.getStatus());
+ Long upgrading = upgradeRecordMapper.getOtaUpgradeRecordStatistics(firmwareId, IotOtaUpgradeRecordStatusEnum.UPGRADING.getStatus());
+ Long success = upgradeRecordMapper.getOtaUpgradeRecordStatistics(firmwareId, IotOtaUpgradeRecordStatusEnum.SUCCESS.getStatus());
+ Long failure = upgradeRecordMapper.getOtaUpgradeRecordStatistics(firmwareId, IotOtaUpgradeRecordStatusEnum.FAILURE.getStatus());
+ Long canceled = upgradeRecordMapper.getOtaUpgradeRecordStatistics(firmwareId, IotOtaUpgradeRecordStatusEnum.CANCELED.getStatus());
+ // 将统计结果封装为Map并返回
+ return Map.of(IotOtaUpgradeRecordPageReqVO.PENDING, pending,
+ IotOtaUpgradeRecordPageReqVO.PUSHED, pushed,
+ IotOtaUpgradeRecordPageReqVO.UPGRADING, upgrading,
+ IotOtaUpgradeRecordPageReqVO.SUCCESS, success,
+ IotOtaUpgradeRecordPageReqVO.FAILURE, failure,
+ IotOtaUpgradeRecordPageReqVO.CANCELED, canceled);
+ }
+
+ @Override
+ public void retryUpgradeRecord(Long id) {
+ // 1.1.校验升级记录信息是否存在
+ IotOtaUpgradeRecordDO upgradeRecord = validateUpgradeRecordExists(id);
+ // 1.2.校验升级记录是否可以重新升级
+ validateUpgradeRecordCanRetry(upgradeRecord);
+
+ // 2.将一些数据重置，这样定时任务轮询就可以重启任务
+ upgradeRecordMapper.updateById(new IotOtaUpgradeRecordDO()
+ .setId(upgradeRecord.getId()).setProgress(0)
+ .setStatus(IotOtaUpgradeRecordStatusEnum.PENDING.getStatus()));
+ // TODO @芋艿: 重试升级记录触发的其他Action
+ // TODO 如果一个升级记录被取消或者已经执行失败，重试成功，是否会对升级任务的状态有影响？
+ }
+
+ @Override
+ public IotOtaUpgradeRecordDO getUpgradeRecord(Long id) {
+ return upgradeRecordMapper.selectById(id);
+ }
+
+ @Override
+ public PageResult getUpgradeRecordPage(IotOtaUpgradeRecordPageReqVO pageReqVO) {
+ return upgradeRecordMapper.selectUpgradeRecordPage(pageReqVO);
+ }
+
+ @Override
+ public void cancelUpgradeRecordByTaskId(Long taskId) {
+ // 暂定只有待推送的升级记录可以取消
+ upgradeRecordMapper.cancelUpgradeRecordByTaskId(taskId);
+ }
+
+ @Override
+ public List getUpgradeRecordListByState(Integer state) {
+ return upgradeRecordMapper.selectUpgradeRecordListByState(state);
+ }
+
+ @Override
+ public void updateUpgradeRecordStatus(List ids, Integer status) {
+ upgradeRecordMapper.updateUpgradeRecordStatus(ids, status);
+ }
+
+ @Override
+ public List getUpgradeRecordListByTaskId(Long taskId) {
+ return upgradeRecordMapper.selectUpgradeRecordListByTaskId(taskId);
+ }
+
+ /**
+ * 验证指定的升级记录是否存在。
+ *
+ * 该函数通过给定的ID查询升级记录，如果查询结果为空，则抛出异常，表示升级记录不存在。
+ *
+ * @param id 升级记录的唯一标识符，类型为Long。
+ * @throws cn.iocoder.yudao.framework.common.exception.ServiceException，则抛出异常，异常类型为OTA_UPGRADE_RECORD_NOT_EXISTS。
+ */
+ private IotOtaUpgradeRecordDO validateUpgradeRecordExists(Long id) {
+ // 根据ID查询升级记录
+ IotOtaUpgradeRecordDO upgradeRecord = upgradeRecordMapper.selectById(id);
+ // 如果查询结果为空，抛出异常
+ if (upgradeRecord == null) {
+ throw exception(OTA_UPGRADE_RECORD_NOT_EXISTS);
+ }
+ return upgradeRecord;
+ }
+
+ /**
+ * 验证固件升级记录是否存在。
+ *
+ * 该函数通过给定的固件ID、任务ID和设备ID查询升级记录，如果查询结果为空，则抛出异常。
+ *
+ * @param firmwareId 固件ID，用于标识特定的固件版本
+ * @param taskId 任务ID，用于标识特定的升级任务
+ * @param deviceId 设备ID，用于标识特定的设备
+ * @throws cn.iocoder.yudao.framework.common.exception.ServiceException，则抛出OTA_UPGRADE_RECORD_NOT_EXISTS异常
+ */
+ private void validateUpgradeRecordDuplicate(Long firmwareId, Long taskId, String deviceId) {
+ // 根据条件查询升级记录
+ IotOtaUpgradeRecordDO upgradeRecord = upgradeRecordMapper.selectByConditions(firmwareId, taskId, deviceId);
+ // 如果查询结果为空，抛出异常
+ if (upgradeRecord != null) {
+ throw exception(OTA_UPGRADE_RECORD_DUPLICATE);
+ }
+ }
+
+ /**
+ * 验证升级记录是否可以重试。
+ *
+ * 该方法用于检查给定的升级记录是否处于允许重试的状态。如果升级记录的状态为
+ * PENDING、PUSHED 或 UPGRADING，则抛出异常，表示不允许重试。
+ *
+ * @param upgradeRecord 需要验证的升级记录对象，类型为 IotOtaUpgradeRecordDO
+ * @throws cn.iocoder.yudao.framework.common.exception.ServiceException，则抛出 OTA_UPGRADE_RECORD_CANNOT_RETRY 异常
+ */
+ private void validateUpgradeRecordCanRetry(IotOtaUpgradeRecordDO upgradeRecord) {
+ // 检查升级记录的状态是否为 PENDING、PUSHED 或 UPGRADING
+ if (ObjectUtils.equalsAny(upgradeRecord.getStatus(),
+ IotOtaUpgradeRecordStatusEnum.PENDING.getStatus(),
+ IotOtaUpgradeRecordStatusEnum.PUSHED.getStatus(),
+ IotOtaUpgradeRecordStatusEnum.UPGRADING.getStatus())) {
+ // 如果升级记录处于上述状态之一，则抛出异常，表示不允许重试
+ throw exception(OTA_UPGRADE_RECORD_CANNOT_RETRY);
+ }
+ }
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaUpgradeTaskService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaUpgradeTaskService.java
new file mode 100644
index 0000000000..1f5476df15
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaUpgradeTaskService.java
@@ -0,0 +1,68 @@
+package cn.iocoder.yudao.module.iot.service.ota;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.iot.controller.admin.ota.vo.upgrade.task.IotOtaUpgradeTaskPageReqVO;
+import cn.iocoder.yudao.module.iot.controller.admin.ota.vo.upgrade.task.IotOtaUpgradeTaskSaveReqVO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.ota.IotOtaUpgradeTaskDO;
+import jakarta.validation.Valid;
+
+import java.util.List;
+
+// TODO @li：类、方法注释有点冗余，可以参考别的模块哈
+/**
+ * IoT OTA升级任务服务接口
+ * 提供OTA升级任务的创建、取消和查询功能
+ */
+public interface IotOtaUpgradeTaskService {
+
+ /**
+ * 创建OTA升级任务
+ *
+ * @param createReqVO OTA升级任务的创建请求对象，包含创建任务所需的信息
+ * @return 创建成功的OTA升级任务的ID
+ */
+ Long createUpgradeTask(@Valid IotOtaUpgradeTaskSaveReqVO createReqVO);
+
+ /**
+ * 取消OTA升级任务
+ *
+ * @param id 要取消的OTA升级任务的ID
+ */
+ void cancelUpgradeTask(Long id);
+
+ /**
+ * 根据ID获取OTA升级任务的详细信息
+ *
+ * @param id OTA升级任务的ID
+ * @return OTA升级任务的详细信息对象
+ */
+ IotOtaUpgradeTaskDO getUpgradeTask(Long id);
+
+ /**
+ * 分页查询OTA升级任务
+ *
+ * @param pageReqVO OTA升级任务的分页查询请求对象，包含查询条件和分页信息
+ * @return 分页查询结果，包含OTA升级任务列表和总记录数
+ */
+ PageResult getUpgradeTaskPage(@Valid IotOtaUpgradeTaskPageReqVO pageReqVO);
+
+ /**
+ * 根据任务状态获取升级任务列表
+ *
+ * @param state 任务状态，用于筛选符合条件的升级任务
+ * @return 返回符合指定状态的升级任务列表，列表中的元素为 IotOtaUpgradeTaskDO 对象
+ */
+ List getUpgradeTaskByState(Integer state);
+
+ /**
+ * 更新升级任务的状态。
+ *
+ * 该函数用于根据任务ID更新指定升级任务的状态。通常用于在任务执行过程中
+ * 更新任务的状态，例如从“进行中”变为“已完成”或“失败”。
+ *
+ * @param id 升级任务的唯一标识符，类型为Long。不能为null。
+ * @param status 要更新的任务状态，类型为Integer。通常表示任务的状态码，如0表示未开始，1表示进行中，2表示已完成等。
+ */
+ void updateUpgradeTaskStatus(Long id, Integer status);
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaUpgradeTaskServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaUpgradeTaskServiceImpl.java
new file mode 100644
index 0000000000..cef1448e9a
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaUpgradeTaskServiceImpl.java
@@ -0,0 +1,249 @@
+package cn.iocoder.yudao.module.iot.service.ota;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.iot.controller.admin.ota.vo.upgrade.task.IotOtaUpgradeTaskPageReqVO;
+import cn.iocoder.yudao.module.iot.controller.admin.ota.vo.upgrade.task.IotOtaUpgradeTaskSaveReqVO;
+import cn.iocoder.yudao.module.iot.convert.ota.IotOtaUpgradeRecordConvert;
+import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.ota.IotOtaFirmwareDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.ota.IotOtaUpgradeTaskDO;
+import cn.iocoder.yudao.module.iot.dal.mysql.ota.IotOtaUpgradeTaskMapper;
+import cn.iocoder.yudao.module.iot.enums.ota.IotOtaUpgradeTaskScopeEnum;
+import cn.iocoder.yudao.module.iot.enums.ota.IotOtaUpgradeTaskStatusEnum;
+import cn.iocoder.yudao.module.iot.service.device.IotDeviceService;
+import cn.iocoder.yudao.module.iot.service.ota.bo.IotOtaUpgradeRecordCreateReqBO;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
+import java.util.Objects;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.*;
+
+@Slf4j
+@Service
+@Validated
+public class IotOtaUpgradeTaskServiceImpl implements IotOtaUpgradeTaskService {
+
+ @Resource
+ private IotOtaUpgradeTaskMapper upgradeTaskMapper;
+
+ @Resource
+ @Lazy
+ private IotDeviceService deviceService;
+ @Resource
+ @Lazy
+ private IotOtaFirmwareService firmwareService;
+ @Resource
+ @Lazy
+ private IotOtaUpgradeRecordService upgradeRecordService;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long createUpgradeTask(IotOtaUpgradeTaskSaveReqVO createReqVO) {
+ // 1.1 校验同一固件的升级任务名称不重复
+ validateFirmwareTaskDuplicate(createReqVO.getFirmwareId(), createReqVO.getName());
+ // 1.2 校验固件信息是否存在
+ IotOtaFirmwareDO firmware = firmwareService.validateFirmwareExists(createReqVO.getFirmwareId());
+ // 1.3 校验升级范围=2(指定设备时),deviceIds deviceNames不为空并且长度相等
+ // TODO @li：deviceNames 应该后端查询
+ validateScopeAndDevice(createReqVO.getScope(), createReqVO.getDeviceIds(), createReqVO.getDeviceNames());
+ // TODO @li：如果全部范围，但是没设备可以升级，需要报错
+
+ // 2. 保存 OTA 升级任务信息到数据库
+ IotOtaUpgradeTaskDO upgradeTask = initUpgradeTask(createReqVO, firmware.getProductId());
+ upgradeTaskMapper.insert(upgradeTask);
+
+ // 3. 生成设备升级记录信息并存储，等待定时任务轮询
+ List upgradeRecordList = initUpgradeRecordList(
+ upgradeTask, firmware, createReqVO.getDeviceIds());
+ // TODO @li：只需要传递 deviceIds、firewareId、剩余的 upgradeRecordService 里面自己处理；这样，后续 record 加字段，都不需要透传太多；解耦
+ upgradeRecordService.createUpgradeRecordBatch(upgradeRecordList);
+ // TODO @芋艿: 创建任务触发的其他Action
+ return upgradeTask.getId();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void cancelUpgradeTask(Long id) {
+ // 1.1 校验升级任务是否存在
+ IotOtaUpgradeTaskDO upgradeTask = validateUpgradeTaskExists(id);
+ // 1.2 校验升级任务是否可以取消
+ // TODO @li：这种一次性的，可以不考虑拆分方法
+ validateUpgradeTaskCanCancel(upgradeTask);
+
+ // 2. 更新 OTA 升级任务状态为已取消
+ upgradeTaskMapper.updateById(IotOtaUpgradeTaskDO.builder()
+ .id(id).status(IotOtaUpgradeTaskStatusEnum.CANCELED.getStatus())
+ .build());
+ // 3. 更新 OTA 升级记录状态为已取消
+ upgradeRecordService.cancelUpgradeRecordByTaskId(id);
+ // TODO @芋艿: 取消任务触发的其他Action
+ }
+
+ @Override
+ public IotOtaUpgradeTaskDO getUpgradeTask(Long id) {
+ return upgradeTaskMapper.selectById(id);
+ }
+
+ @Override
+ public PageResult getUpgradeTaskPage(IotOtaUpgradeTaskPageReqVO pageReqVO) {
+ return upgradeTaskMapper.selectUpgradeTaskPage(pageReqVO);
+ }
+
+ @Override
+ public List getUpgradeTaskByState(Integer state) {
+ return upgradeTaskMapper.selectUpgradeTaskByState(state);
+ }
+
+ @Override
+ public void updateUpgradeTaskStatus(Long id, Integer status) {
+ upgradeTaskMapper.updateById(IotOtaUpgradeTaskDO.builder()
+ .id(id).status(status)
+ .build());
+ }
+
+ /**
+ * 校验固件升级任务是否重复
+ *
+ * 该方法用于检查给定固件ID和任务名称组合是否已存在于数据库中，如果存在则抛出异常，
+ * 表示任务名称对于该固件而言是重复的此检查确保用户不能创建具有相同名称的任务，
+ * 从而避免数据重复和混淆
+ *
+ * @param firmwareId 固件的唯一标识符，用于区分不同的固件
+ * @param taskName 升级任务的名称，用于与固件ID一起检查重复性
+ * @throws cn.iocoder.yudao.framework.common.exception.ServerException 则抛出预定义的异常
+ */
+ private void validateFirmwareTaskDuplicate(Long firmwareId, String taskName) {
+ // 查询数据库中是否有相同固件ID和任务名称的升级任务存在
+ List upgradeTaskList = upgradeTaskMapper.selectByFirmwareIdAndName(firmwareId, taskName);
+ // 如果查询结果不为空，说明存在重复的任务名称，抛出异常
+ if (CollUtil.isNotEmpty(upgradeTaskList)) {
+ throw exception(OTA_UPGRADE_TASK_NAME_DUPLICATE);
+ }
+ }
+
+ /**
+ * 验证升级任务的范围和设备参数是否有效
+ * 当选择特定设备进行升级时，确保提供的设备ID和设备名称列表有效且对应
+ *
+ * @param scope 升级任务的范围，表示是选择特定设备还是其他范围
+ * @param deviceIds 设备ID列表，用于标识参与升级的设备
+ * @param deviceNames 设备名称列表，与设备ID列表对应
+ */
+ private void validateScopeAndDevice(Integer scope, List deviceIds, List deviceNames) {
+ // 当升级任务范围为选择特定设备时
+ if (Objects.equals(scope, IotOtaUpgradeTaskScopeEnum.SELECT.getScope())) {
+ // 检查设备ID列表和设备名称列表是否为空或长度不一致，若不符合要求，则抛出异常
+ if (CollUtil.isEmpty(deviceIds) || CollUtil.isEmpty(deviceNames) || deviceIds.size() != deviceNames.size()) {
+ throw exception(OTA_UPGRADE_TASK_PARAMS_INVALID);
+ }
+ }
+ }
+
+ /**
+ * 验证升级任务是否存在
+ *
+ * 通过查询数据库来验证给定ID的升级任务是否存在此方法主要用于确保后续操作所针对的升级任务是有效的
+ *
+ * @param id 升级任务的唯一标识符如果为null或数据库中不存在对应的记录，则认为任务不存在
+ * @throws cn.iocoder.yudao.framework.common.exception.ServiceException 如果升级任务不存在，则抛出异常提示任务不存在
+ */
+ private IotOtaUpgradeTaskDO validateUpgradeTaskExists(Long id) {
+ // 查询数据库中是否有相同固件ID和任务名称的升级任务存在
+ IotOtaUpgradeTaskDO upgradeTask = upgradeTaskMapper.selectById(id);
+ // 如果查询结果不为空，说明存在重复的任务名称，抛出异常
+ if (Objects.isNull(upgradeTask)) {
+ throw exception(OTA_UPGRADE_TASK_NOT_EXISTS);
+ }
+ return upgradeTask;
+ }
+
+ /**
+ * 验证升级任务是否可以被取消
+ *
+ * 此方法旨在确保只有当升级任务处于进行中状态时，才可以执行取消操作
+ * 它通过比较任务的当前状态与预定义的进行中状态来判断是否允许取消操作
+ * 如果任务状态不符合条件，则抛出异常，表明该任务无法取消
+ *
+ * @param upgradeTask 待验证的升级任务对象，包含任务的详细信息，如状态等
+ * @throws cn.iocoder.yudao.framework.common.exception.ServiceException 如果任务状态不是进行中，则抛出此异常，表明任务无法取消
+ */
+ private void validateUpgradeTaskCanCancel(IotOtaUpgradeTaskDO upgradeTask) {
+ // 检查升级任务的状态是否为进行中，只有此状态下的任务才允许取消
+ if (!Objects.equals(upgradeTask.getStatus(), IotOtaUpgradeTaskStatusEnum.IN_PROGRESS.getStatus())) {
+ // 只有进行中的任务才可以取消
+ throw exception(OTA_UPGRADE_TASK_CANNOT_CANCEL);
+ }
+ }
+
+ // TODO @li：一次性，不复用的，可以直接写在对应的逻辑里；
+ /**
+ * 初始化升级任务
+ *
+ * 根据请求参数创建升级任务对象，并根据选择的范围初始化设备数量
+ * 如果选择特定设备进行升级，则设备数量为所选设备的总数
+ * 如果选择全部设备进行升级，则设备数量为该固件对应产品下的所有设备总数
+ *
+ * @param createReqVO 升级任务保存请求对象，包含创建升级任务所需的信息
+ * @return 返回初始化后的升级任务对象
+ */
+ private IotOtaUpgradeTaskDO initUpgradeTask(IotOtaUpgradeTaskSaveReqVO createReqVO, String productId) {
+ // 配置各项参数
+ IotOtaUpgradeTaskDO upgradeTask = IotOtaUpgradeTaskDO.builder()
+ // TODO @li：不用每个占一行。最好相同类型的，放在一行里；
+ .name(createReqVO.getName())
+ .description(createReqVO.getDescription())
+ .firmwareId(createReqVO.getFirmwareId())
+ .scope(createReqVO.getScope())
+ .deviceIds(createReqVO.getDeviceIds())
+ .deviceNames(createReqVO.getDeviceNames())
+ .deviceCount(Convert.toLong(CollUtil.size(createReqVO.getDeviceIds())))
+ .status(IotOtaUpgradeTaskStatusEnum.IN_PROGRESS.getStatus())
+ .build();
+ // 如果选择全选，则需要查询设备数量
+ if (Objects.equals(createReqVO.getScope(), IotOtaUpgradeTaskScopeEnum.ALL.getScope())) {
+ // 根据产品ID查询设备数量
+ Long deviceCount = deviceService.getDeviceCountByProductId(Convert.toLong(productId));
+ // 设置升级任务的设备数量
+ upgradeTask.setDeviceCount(deviceCount);
+ }
+ // 返回初始化后的升级任务对象
+ return upgradeTask;
+ }
+
+ /**
+ * 初始化升级记录列表
+ *
+ * 根据升级任务的范围（选择设备或按产品ID）获取设备列表，并将其转换为升级记录请求对象列表。
+ *
+ * @param upgradeTask 升级任务对象，包含升级任务的相关信息
+ * @param firmware 固件对象，包含固件的相关信息
+ * @param deviceIds 设备ID列表，仅在升级任务范围为选择设备时使用
+ * @return 升级记录请求对象列表，包含每个设备的升级记录信息
+ */
+ private List initUpgradeRecordList(
+ IotOtaUpgradeTaskDO upgradeTask, IotOtaFirmwareDO firmware, List deviceIds) {
+ // TODO @li：需要考虑，如果创建多个任务，相互之间不能重复；
+ // 1）指定设备的时候，进行校验；2）如果是全部，则过滤其它已经发起的；；；；；另外，需要排除掉 cancel 的哈。因为 cancal 之后，还可以发起
+ // 根据升级任务的范围确定设备列表
+ List deviceList;
+ if (Objects.equals(upgradeTask.getScope(), IotOtaUpgradeTaskScopeEnum.SELECT.getScope())) {
+ // 如果升级任务范围为选择设备，则根据设备ID列表获取设备信息
+ deviceList = deviceService.getDeviceListByIdList(deviceIds);
+ } else {
+ // 如果升级任务范围为按产品ID，则根据固件的产品ID获取设备信息
+ deviceList = deviceService.getDeviceListByProductId(Convert.toLong(firmware.getProductId()));
+ }
+ // 将升级任务、固件和设备列表转换为升级记录请求对象列表
+ return IotOtaUpgradeRecordConvert.INSTANCE.convertBOList(upgradeTask, firmware, deviceList);
+ }
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/bo/IotOtaUpgradeRecordCreateReqBO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/bo/IotOtaUpgradeRecordCreateReqBO.java
new file mode 100644
index 0000000000..2567be5294
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/bo/IotOtaUpgradeRecordCreateReqBO.java
@@ -0,0 +1,79 @@
+package cn.iocoder.yudao.module.iot.service.ota.bo;
+
+import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.ota.IotOtaFirmwareDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.ota.IotOtaUpgradeTaskDO;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class IotOtaUpgradeRecordCreateReqBO {
+
+ /**
+ * 固件编号
+ *
+ * 关联 {@link IotOtaFirmwareDO#getId()}
+ */
+ @NotNull(message = "固件编号不能为空")
+ private Long firmwareId;
+ /**
+ * 任务编号
+ *
+ * 关联 {@link IotOtaUpgradeTaskDO#getId()}
+ */
+ @NotNull(message = "任务编号不能为空")
+ private Long taskId;
+ /**
+ * 产品标识
+ *
+ * 关联 {@link cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO#getId()}
+ */
+ private String productKey;
+ /**
+ * 设备名称
+ *
+ * 关联 {@link cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO#getId()}
+ */
+ private String deviceName;
+ /**
+ * 设备编号
+ *
+ * 关联 {@link cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO#getId()}
+ */
+ @NotNull(message = "设备编号不能为空")
+ private String deviceId;
+ /**
+ * 来源的固件编号
+ *
+ * 关联 {@link IotDeviceDO#getFirmwareId()}
+ */
+ private Long fromFirmwareId;
+ /**
+ * 升级状态
+ *
+ * 关联 {@link cn.iocoder.yudao.module.iot.enums.ota.IotOtaUpgradeRecordStatusEnum}
+ */
+ private Integer status;
+ /**
+ * 升级进度，百分比
+ */
+ private Integer progress;
+ /**
+ * 升级进度描述
+ *
+ * 注意，只记录设备最后一次的升级进度描述
+ * 如果想看历史记录，可以查看 {@link cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceLogDO} 设备日志
+ */
+ private String description;
+ /**
+ * 升级开始时间
+ */
+ private LocalDateTime startTime;
+ /**
+ * 升级结束时间
+ */
+ private LocalDateTime endTime;
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/bo/IotOtaUpgradeRecordUpdateReqBO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/bo/IotOtaUpgradeRecordUpdateReqBO.java
new file mode 100644
index 0000000000..ac73aa884e
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/bo/IotOtaUpgradeRecordUpdateReqBO.java
@@ -0,0 +1,46 @@
+package cn.iocoder.yudao.module.iot.service.ota.bo;
+
+import cn.iocoder.yudao.framework.common.validation.InEnum;
+import cn.iocoder.yudao.module.iot.enums.ota.IotOtaUpgradeRecordStatusEnum;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.hibernate.validator.constraints.Range;
+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;
+
+// TODO @li：这个类，貌似没用？
+@Data
+public class IotOtaUpgradeRecordUpdateReqBO {
+
+ /**
+ * 升级记录编号
+ */
+ @NotNull(message = "升级记录编号不能为空")
+ private Long id;
+ /**
+ * 升级状态
+ *
+ * 关联 {@link cn.iocoder.yudao.module.iot.enums.ota.IotOtaUpgradeRecordStatusEnum}
+ */
+ @InEnum(IotOtaUpgradeRecordStatusEnum.class)
+ private Integer status;
+ /**
+ * 升级进度，百分比
+ */
+ @Range(min = 0, max = 100, message = "升级进度必须介于 0-100 之间")
+ private Integer progress;
+ /**
+ * 升级开始时间
+ */
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime startTime;
+ /**
+ * 升级结束时间
+ */
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime endTime;
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/action/IotRuleSceneDataBridgeAction.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/action/IotRuleSceneDataBridgeAction.java
index 7668c05b94..6733331cb4 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/action/IotRuleSceneDataBridgeAction.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/action/IotRuleSceneDataBridgeAction.java
@@ -1,51 +1,32 @@
package cn.iocoder.yudao.module.iot.service.rule.action;
-import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
-import cn.iocoder.yudao.framework.common.util.http.HttpUtils;
-import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotDataBridgeDO;
import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotRuleSceneDO;
-import cn.iocoder.yudao.module.iot.enums.rule.IotDataBridgTypeEnum;
import cn.iocoder.yudao.module.iot.enums.rule.IotRuleSceneActionTypeEnum;
import cn.iocoder.yudao.module.iot.mq.message.IotDeviceMessage;
import cn.iocoder.yudao.module.iot.service.rule.IotDataBridgeService;
+import cn.iocoder.yudao.module.iot.service.rule.action.databridge.IotDataBridgeExecute;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
-import org.apache.rocketmq.client.producer.DefaultMQProducer;
-import org.apache.rocketmq.client.producer.SendResult;
-import org.apache.rocketmq.client.producer.SendStatus;
-import org.apache.rocketmq.common.message.Message;
-import org.apache.rocketmq.remoting.common.RemotingHelper;
-import org.springframework.http.*;
import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.util.UriComponentsBuilder;
-import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.Map;
-
-import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.HEADER_TENANT_ID;
+import java.util.List;
/**
* IoT 数据桥梁的 {@link IotRuleSceneAction} 实现类
*
* @author 芋道源码
*/
-// TODO @芋艿：【优化】因为 bridge 会比较多，所以可以考虑在 rule 下，新建一个 bridge 的 package，然后定义一个 bridgehandler，它有：
-// 1. input 方法、output 方法
-// 2. build 方法，用于有状态的连接，例如说 mq、tcp、websocket
@Component
@Slf4j
public class IotRuleSceneDataBridgeAction implements IotRuleSceneAction {
- @Resource
- private RestTemplate restTemplate;
-
@Resource
private IotDataBridgeService dataBridgeService;
+ @Resource
+ private List dataBridgeExecutes;
@Override
public void execute(IotDeviceMessage message, IotRuleSceneDO.ActionConfig config) {
@@ -65,26 +46,8 @@ public class IotRuleSceneDataBridgeAction implements IotRuleSceneAction {
return;
}
- // 2.1 执行 HTTP 请求
- if (IotDataBridgTypeEnum.HTTP.getType().equals(dataBridge.getType())) {
- executeHttp(message, (IotDataBridgeDO.HttpConfig) dataBridge.getConfig());
- return;
- }
- // 2.2 执行 RocketMQ 发送消息
- if (IotDataBridgTypeEnum.ROCKETMQ.getType().equals(dataBridge.getType())) {
- executeRocketMQ(message, (IotDataBridgeDO.RocketMQConfig) dataBridge.getConfig());
- return;
- }
-
- // TODO @芋艿：因为下面的，都是有状态的，所以通过 guava 缓存连接，然后通过 RemovalNotification 实现关闭。例如说，一次新建有效期是 10 分钟；
- // TODO @芋艿：mq-redis
- // TODO @芋艿：mq-数据库
- // TODO @芋艿：kafka
- // TODO @芋艿：rocketmq
- // TODO @芋艿：rabbitmq
- // TODO @芋艿：mqtt
- // TODO @芋艿：tcp
- // TODO @芋艿：websocket
+ // 2. 执行数据桥接操作
+ dataBridgeExecutes.forEach(execute -> execute.execute(message, dataBridge));
}
@Override
@@ -92,115 +55,4 @@ public class IotRuleSceneDataBridgeAction implements IotRuleSceneAction {
return IotRuleSceneActionTypeEnum.DATA_BRIDGE;
}
- @SuppressWarnings({"unchecked", "deprecation"})
- private void executeHttp(IotDeviceMessage message, IotDataBridgeDO.HttpConfig config) {
- String url = null;
- HttpMethod method = HttpMethod.valueOf(config.getMethod().toUpperCase());
- HttpEntity requestEntity = null;
- ResponseEntity responseEntity = null;
- try {
- // 1.1 构建 Header
- HttpHeaders headers = new HttpHeaders();
- if (CollUtil.isNotEmpty(config.getHeaders())) {
- config.getHeaders().putAll(config.getHeaders());
- }
- headers.add(HEADER_TENANT_ID, message.getTenantId().toString());
- // 1.2 构建 URL
- UriComponentsBuilder uriBuilder = UriComponentsBuilder.fromUriString(config.getUrl());
- if (CollUtil.isNotEmpty(config.getQuery())) {
- config.getQuery().forEach(uriBuilder::queryParam);
- }
- // 1.3 构建请求体
- if (method == HttpMethod.GET) {
- uriBuilder.queryParam("message", HttpUtils.encodeUtf8(JsonUtils.toJsonString(message)));
- url = uriBuilder.build().toUriString();
- requestEntity = new HttpEntity<>(headers);
- } else {
- url = uriBuilder.build().toUriString();
- Map requestBody = JsonUtils.parseObject(config.getBody(), Map.class);
- if (requestBody == null) {
- requestBody = new HashMap<>();
- }
- requestBody.put("message", message);
- headers.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_UTF8_VALUE);
- requestEntity = new HttpEntity<>(JsonUtils.toJsonString(requestBody), headers);
- }
-
- // 2.1 发送请求
- responseEntity = restTemplate.exchange(url, method, requestEntity, String.class);
- // 2.2 记录日志
- if (responseEntity.getStatusCode().is2xxSuccessful()) {
- log.info("[executeHttp][message({}) config({}) url({}) method({}) requestEntity({}) 请求成功({})]",
- message, config, url, method, requestEntity, responseEntity);
- } else {
- log.error("[executeHttp][message({}) config({}) url({}) method({}) requestEntity({}) 请求失败({})]",
- message, config, url, method, requestEntity, responseEntity);
- }
- } catch (Exception e) {
- log.error("[executeHttp][message({}) config({}) url({}) method({}) requestEntity({}) 请求异常({})]",
- message, config, url, method, requestEntity, responseEntity, e);
- }
- }
-
- private void executeRocketMQ(IotDeviceMessage message, IotDataBridgeDO.RocketMQConfig config) {
- // 1.1 创建生产者实例，指定生产者组名
- DefaultMQProducer producer = new DefaultMQProducer(config.getGroup());
- // TODO @puhui999：可以考虑，基于 guava 做 cache，使用 config 作为 key，然后假个 listener 超时，销毁 producer
- try {
- // 1.2 设置 NameServer 地址
- producer.setNamesrvAddr(config.getNameServer());
- // 1.3 启动生产者
- producer.start();
-
- // 2.1 创建消息对象，指定Topic、Tag和消息体
- Message msg = new Message(
- config.getTopic(),
- config.getTags(),
- message.toString().getBytes(RemotingHelper.DEFAULT_CHARSET)
- );
- // 2.2 发送同步消息并处理结果
- SendResult sendResult = producer.send(msg);
- // 2.3 处理发送结果
- if (SendStatus.SEND_OK.equals(sendResult.getSendStatus())) {
- log.info("[executeRocketMQ][message({}) config({}) 发送成功，结果({})]", message, config, sendResult);
- } else {
- log.error("[executeRocketMQ][message({}) config({}) 发送失败，结果({})]", message, config, sendResult);
- }
- } catch (Exception e) {
- log.error("[executeRocketMQ][message({}) config({}) 发送异常]", message, config, e);
- } finally {
- // 3. 关闭生产者
- producer.shutdown();
- }
- }
-
- // TODO @芋艿：测试代码，后续清理
- public static void main(String[] args) {
- // 1. 创建 IotRuleSceneDataBridgeAction 实例
- IotRuleSceneDataBridgeAction action = new IotRuleSceneDataBridgeAction();
-
- // 2. 创建测试消息
- IotDeviceMessage message = IotDeviceMessage.builder()
- .requestId("TEST-001")
- .productKey("testProduct")
- .deviceName("testDevice")
- .deviceKey("testDeviceKey")
- .type("property")
- .identifier("temperature")
- .data("{\"value\": 60}")
- .reportTime(LocalDateTime.now())
- .tenantId(1L)
- .build();
-
- // 3. 创建 RocketMQ 配置
- IotDataBridgeDO.RocketMQConfig config = new IotDataBridgeDO.RocketMQConfig();
- config.setNameServer("127.0.0.1:9876");
- config.setGroup("test-group");
- config.setTopic("test-topic");
- config.setTags("test-tag");
-
- // 4. 执行测试
- action.executeRocketMQ(message, config);
- }
-
}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/action/databridge/IotDataBridgeExecute.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/action/databridge/IotDataBridgeExecute.java
new file mode 100644
index 0000000000..cd00f4f3e7
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/action/databridge/IotDataBridgeExecute.java
@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.iot.service.rule.action.databridge;
+
+import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotDataBridgeDO;
+import cn.iocoder.yudao.module.iot.mq.message.IotDeviceMessage;
+
+
+/**
+ * IoT 数据桥梁的执行器 execute 接口
+ *
+ * @author HUIHUI
+ */
+public interface IotDataBridgeExecute {
+
+ /**
+ * 执行数据桥接操作
+ *
+ * @param message 设备消息
+ * @param dataBridge 数据桥梁
+ */
+ void execute(IotDeviceMessage message, IotDataBridgeDO dataBridge);
+
+ // TODO @芋艿：因为下面的，都是有状态的，所以通过 guava 缓存连接，然后通过 RemovalNotification 实现关闭。例如说，一次新建有效期是 10 分钟；
+ // TODO @芋艿：mq-redis
+ // TODO @芋艿：mq-数据库
+ // TODO @芋艿：kafka
+ // TODO @芋艿：rocketmq
+ // TODO @芋艿：rabbitmq
+ // TODO @芋艿：mqtt
+ // TODO @芋艿：tcp
+ // TODO @芋艿：websocket
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/action/databridge/IotHttpDataBridgeExecute.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/action/databridge/IotHttpDataBridgeExecute.java
new file mode 100644
index 0000000000..76f1b793f6
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/action/databridge/IotHttpDataBridgeExecute.java
@@ -0,0 +1,93 @@
+package cn.iocoder.yudao.module.iot.service.rule.action.databridge;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.common.util.http.HttpUtils;
+import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
+import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotDataBridgeDO;
+import cn.iocoder.yudao.module.iot.enums.rule.IotDataBridgTypeEnum;
+import cn.iocoder.yudao.module.iot.mq.message.IotDeviceMessage;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.*;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.HEADER_TENANT_ID;
+
+/**
+ * Http 的 {@link IotDataBridgeExecute} 实现类
+ *
+ * @author HUIHUI
+ */
+@Component
+@Slf4j
+public class IotHttpDataBridgeExecute implements IotDataBridgeExecute {
+
+ @Resource
+ private RestTemplate restTemplate;
+
+ @Override
+ public void execute(IotDeviceMessage message, IotDataBridgeDO dataBridge) {
+ // 1.1 校验数据桥接的类型 == HTTP
+ if (!IotDataBridgTypeEnum.HTTP.getType().equals(dataBridge.getType())) {
+ return;
+ }
+ // 1.2 执行 HTTP 请求
+ executeHttp(message, (IotDataBridgeDO.HttpConfig) dataBridge.getConfig());
+ }
+
+ @SuppressWarnings({"unchecked", "deprecation"})
+ private void executeHttp(IotDeviceMessage message, IotDataBridgeDO.HttpConfig config) {
+ String url = null;
+ HttpMethod method = HttpMethod.valueOf(config.getMethod().toUpperCase());
+ HttpEntity requestEntity = null;
+ ResponseEntity responseEntity = null;
+ try {
+ // 1.1 构建 Header
+ HttpHeaders headers = new HttpHeaders();
+ if (CollUtil.isNotEmpty(config.getHeaders())) {
+ config.getHeaders().putAll(config.getHeaders());
+ }
+ headers.add(HEADER_TENANT_ID, message.getTenantId().toString());
+ // 1.2 构建 URL
+ UriComponentsBuilder uriBuilder = UriComponentsBuilder.fromUriString(config.getUrl());
+ if (CollUtil.isNotEmpty(config.getQuery())) {
+ config.getQuery().forEach(uriBuilder::queryParam);
+ }
+ // 1.3 构建请求体
+ if (method == HttpMethod.GET) {
+ uriBuilder.queryParam("message", HttpUtils.encodeUtf8(JsonUtils.toJsonString(message)));
+ url = uriBuilder.build().toUriString();
+ requestEntity = new HttpEntity<>(headers);
+ } else {
+ url = uriBuilder.build().toUriString();
+ Map requestBody = JsonUtils.parseObject(config.getBody(), Map.class);
+ if (requestBody == null) {
+ requestBody = new HashMap<>();
+ }
+ requestBody.put("message", message);
+ headers.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_UTF8_VALUE);
+ requestEntity = new HttpEntity<>(JsonUtils.toJsonString(requestBody), headers);
+ }
+
+ // 2.1 发送请求
+ responseEntity = restTemplate.exchange(url, method, requestEntity, String.class);
+ // 2.2 记录日志
+ if (responseEntity.getStatusCode().is2xxSuccessful()) {
+ log.info("[executeHttp][message({}) config({}) url({}) method({}) requestEntity({}) 请求成功({})]",
+ message, config, url, method, requestEntity, responseEntity);
+ } else {
+ log.error("[executeHttp][message({}) config({}) url({}) method({}) requestEntity({}) 请求失败({})]",
+ message, config, url, method, requestEntity, responseEntity);
+ }
+ } catch (Exception e) {
+ log.error("[executeHttp][message({}) config({}) url({}) method({}) requestEntity({}) 请求异常({})]",
+ message, config, url, method, requestEntity, responseEntity, e);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/action/databridge/IotRocketMQDataBridgeExecute.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/action/databridge/IotRocketMQDataBridgeExecute.java
new file mode 100644
index 0000000000..626208e187
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/action/databridge/IotRocketMQDataBridgeExecute.java
@@ -0,0 +1,131 @@
+package cn.iocoder.yudao.module.iot.service.rule.action.databridge;
+
+import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotDataBridgeDO;
+import cn.iocoder.yudao.module.iot.enums.rule.IotDataBridgTypeEnum;
+import cn.iocoder.yudao.module.iot.mq.message.IotDeviceMessage;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.client.producer.DefaultMQProducer;
+import org.apache.rocketmq.client.producer.SendResult;
+import org.apache.rocketmq.client.producer.SendStatus;
+import org.apache.rocketmq.common.message.Message;
+import org.apache.rocketmq.remoting.common.RemotingHelper;
+import org.springframework.stereotype.Component;
+
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.util.concurrent.Executors;
+
+/**
+ * RocketMQ 的 {@link IotDataBridgeExecute} 实现类
+ *
+ * @author HUIHUI
+ */
+@Component
+@Slf4j
+public class IotRocketMQDataBridgeExecute implements IotDataBridgeExecute {
+
+ /**
+ * 针对 {@link IotDataBridgeDO.RocketMQConfig} 的 DefaultMQProducer 缓存
+ */
+ // TODO @puhui999：因为 kafka 之类也存在这个情况，是不是得搞个抽象类。提供一个 initProducer，和 closeProducer 方法
+ private final LoadingCache PRODUCER_CACHE = CacheBuilder.newBuilder()
+ .refreshAfterWrite(Duration.ofMinutes(10)) // TODO puhui999：应该是 read 30 分钟哈
+ // 增加移除监听器，自动关闭 producer
+ .removalListener(notification -> {
+ DefaultMQProducer producer = (DefaultMQProducer) notification.getValue();
+ // TODO puhui999：if return，更简短哈
+ if (producer != null) {
+ try {
+ producer.shutdown();
+ log.info("[PRODUCER_CACHE][配置({}) 对应的 producer 已关闭]", notification.getKey());
+ } catch (Exception e) {
+ log.error("[PRODUCER_CACHE][配置({}) 对应的 producer 关闭失败]", notification.getKey(), e);
+ }
+ }
+ })
+ // TODO @puhui999：就同步哈，不用异步处理。
+ // 通过 asyncReloading 实现全异步加载，包括 refreshAfterWrite 被阻塞的加载线程
+ .build(CacheLoader.asyncReloading(new CacheLoader() {
+
+ @Override
+ public DefaultMQProducer load(IotDataBridgeDO.RocketMQConfig config) throws Exception {
+ DefaultMQProducer producer = new DefaultMQProducer(config.getGroup());
+ producer.setNamesrvAddr(config.getNameServer());
+ producer.start();
+ log.info("[PRODUCER_CACHE][配置({}) 对应的 producer 已创建并启动]", config);
+ return producer;
+ }
+
+ }, Executors.newCachedThreadPool()));
+
+ @Override
+ public void execute(IotDeviceMessage message, IotDataBridgeDO dataBridge) {
+ // 1.1 校验数据桥接的类型 == ROCKETMQ
+ if (!IotDataBridgTypeEnum.ROCKETMQ.getType().equals(dataBridge.getType())) {
+ return;
+ }
+ // 1.2 执行 RocketMQ 发送消息
+ executeRocketMQ(message, (IotDataBridgeDO.RocketMQConfig) dataBridge.getConfig());
+ }
+
+ private void executeRocketMQ(IotDeviceMessage message, IotDataBridgeDO.RocketMQConfig config) {
+ try {
+ // 1. 获取或创建 Producer
+ DefaultMQProducer producer = PRODUCER_CACHE.get(config);
+
+ // 2.1 创建消息对象，指定Topic、Tag和消息体
+ Message msg = new Message(
+ config.getTopic(),
+ config.getTags(),
+ message.toString().getBytes(RemotingHelper.DEFAULT_CHARSET)
+ );
+ // 2.2 发送同步消息并处理结果
+ SendResult sendResult = producer.send(msg);
+ // 2.3 处理发送结果
+ if (SendStatus.SEND_OK.equals(sendResult.getSendStatus())) {
+ log.info("[executeRocketMQ][message({}) config({}) 发送成功，结果({})]", message, config, sendResult);
+ } else {
+ log.error("[executeRocketMQ][message({}) config({}) 发送失败，结果({})]", message, config, sendResult);
+ }
+ } catch (Exception e) {
+ log.error("[executeRocketMQ][message({}) config({}) 发送异常]", message, config, e);
+ }
+ }
+
+ // TODO @芋艿：测试代码，后续清理
+ public static void main(String[] args) {
+ // 1. 创建一个共享的实例
+ IotRocketMQDataBridgeExecute action = new IotRocketMQDataBridgeExecute();
+
+ // 2. 创建共享的配置
+ IotDataBridgeDO.RocketMQConfig config = new IotDataBridgeDO.RocketMQConfig();
+ config.setNameServer("127.0.0.1:9876");
+ config.setGroup("test-group");
+ config.setTopic("test-topic");
+ config.setTags("test-tag");
+
+ // 3. 创建共享的消息
+ IotDeviceMessage message = IotDeviceMessage.builder()
+ .requestId("TEST-001")
+ .productKey("testProduct")
+ .deviceName("testDevice")
+ .deviceKey("testDeviceKey")
+ .type("property")
+ .identifier("temperature")
+ .data("{\"value\": 60}")
+ .reportTime(LocalDateTime.now())
+ .tenantId(1L)
+ .build();
+
+ // 4. 执行两次测试，验证缓存
+ log.info("[main][第一次执行，应该会创建新的 producer]");
+ action.executeRocketMQ(message, config);
+
+ log.info("[main][第二次执行，应该会复用缓存的 producer]");
+ action.executeRocketMQ(message, config);
+ }
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/util/MqttSignUtils.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/util/MqttSignUtils.java
new file mode 100644
index 0000000000..7a6b6e441a
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/util/MqttSignUtils.java
@@ -0,0 +1,67 @@
+package cn.iocoder.yudao.module.iot.util;
+
+import cn.hutool.crypto.digest.HMac;
+import cn.hutool.crypto.digest.HmacAlgorithm;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.nio.charset.StandardCharsets;
+
+/**
+ * MQTT 签名工具类
+ *
+ * 提供静态方法来计算 MQTT 连接参数
+ */
+public class MqttSignUtils {
+
+ /**
+ * 计算 MQTT 连接参数
+ *
+ * @param productKey 产品密钥
+ * @param deviceName 设备名称
+ * @param deviceSecret 设备密钥
+ * @return 包含 clientId, username, password 的结果对象
+ */
+ public static MqttSignResult calculate(String productKey, String deviceName, String deviceSecret) {
+ return calculate(productKey, deviceName, deviceSecret, productKey + "." + deviceName);
+ }
+
+ /**
+ * 计算 MQTT 连接参数
+ *
+ * @param productKey 产品密钥
+ * @param deviceName 设备名称
+ * @param deviceSecret 设备密钥
+ * @param clientId 客户端 ID
+ * @return 包含 clientId, username, password 的结果对象
+ */
+ public static MqttSignResult calculate(String productKey, String deviceName, String deviceSecret, String clientId) {
+ String username = deviceName + "&" + productKey;
+ // 构建签名内容
+ StringBuilder signContentBuilder = new StringBuilder()
+ .append("clientId").append(clientId)
+ .append("deviceName").append(deviceName)
+ .append("deviceSecret").append(deviceSecret)
+ .append("productKey").append(productKey);
+
+ // 使用 HMac 计算签名
+ byte[] key = deviceSecret.getBytes(StandardCharsets.UTF_8);
+ String signContent = signContentBuilder.toString();
+ HMac mac = new HMac(HmacAlgorithm.HmacSHA256, key);
+ String password = mac.digestHex(signContent);
+
+ return new MqttSignResult(clientId, username, password);
+ }
+
+ /**
+ * MQTT 签名结果类
+ */
+ @Getter
+ @AllArgsConstructor
+ public static class MqttSignResult {
+ private final String clientId;
+ private final String username;
+ private final String password;
+ }
+
+}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/ota/IotOtaUpgradeRecordMapper.xml b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/ota/IotOtaUpgradeRecordMapper.xml
new file mode 100644
index 0000000000..ea86ba5c40
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/ota/IotOtaUpgradeRecordMapper.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/config/IotPluginCommonAutoConfiguration.java b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/config/IotPluginCommonAutoConfiguration.java
index 7e3d669f20..111189875d 100644
--- a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/config/IotPluginCommonAutoConfiguration.java
+++ b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/config/IotPluginCommonAutoConfiguration.java
@@ -44,8 +44,8 @@ public class IotPluginCommonAutoConfiguration {
@Bean(initMethod = "init", destroyMethod = "stop")
public IotPluginInstanceHeartbeatJob pluginInstanceHeartbeatJob(
- IotDeviceUpstreamApi deviceDataApi, IotDeviceDownstreamServer deviceDownstreamServer) {
- return new IotPluginInstanceHeartbeatJob(deviceDataApi, deviceDownstreamServer);
+ IotDeviceUpstreamApi deviceDataApi, IotDeviceDownstreamServer deviceDownstreamServer, IotPluginCommonProperties commonProperties) {
+ return new IotPluginInstanceHeartbeatJob(deviceDataApi, deviceDownstreamServer, commonProperties);
}
}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/config/IotPluginCommonProperties.java b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/config/IotPluginCommonProperties.java
index 556786507c..03d42c2884 100644
--- a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/config/IotPluginCommonProperties.java
+++ b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/config/IotPluginCommonProperties.java
@@ -7,6 +7,11 @@ import org.springframework.validation.annotation.Validated;
import java.time.Duration;
+/**
+ * IoT 插件的通用配置类
+ *
+ * @author haohao
+ */
@ConfigurationProperties(prefix = "yudao.iot.plugin.common")
@Validated
@Data
@@ -45,4 +50,10 @@ public class IotPluginCommonProperties {
*/
private Integer downstreamPort = DOWNSTREAM_PORT_RANDOM;
+ /**
+ * 插件包标识符
+ */
+ @NotEmpty(message = "插件包标识符不能为空")
+ private String pluginKey;
+
}
diff --git a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/downstream/router/IotDeviceConfigSetVertxHandler.java b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/downstream/router/IotDeviceConfigSetVertxHandler.java
index 337db248f6..5051965b2f 100644
--- a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/downstream/router/IotDeviceConfigSetVertxHandler.java
+++ b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/downstream/router/IotDeviceConfigSetVertxHandler.java
@@ -16,7 +16,7 @@ import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeC
import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR;
/**
- * IOT 设备配置设置 Vertx Handler
+ * IoT 设备配置设置 Vertx Handler
*
* 芋道源码
*/
diff --git a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/downstream/router/IotDeviceOtaUpgradeVertxHandler.java b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/downstream/router/IotDeviceOtaUpgradeVertxHandler.java
index f81d385dc6..0d52dad498 100644
--- a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/downstream/router/IotDeviceOtaUpgradeVertxHandler.java
+++ b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/downstream/router/IotDeviceOtaUpgradeVertxHandler.java
@@ -5,14 +5,19 @@ import cn.iocoder.yudao.module.iot.api.device.dto.control.downstream.IotDeviceOt
import cn.iocoder.yudao.module.iot.plugin.common.downstream.IotDeviceDownstreamHandler;
import cn.iocoder.yudao.module.iot.plugin.common.util.IotPluginCommonUtils;
import io.vertx.core.Handler;
+import io.vertx.core.json.JsonObject;
import io.vertx.ext.web.RoutingContext;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import io.vertx.core.json.JsonObject;
import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR;
+/**
+ * IoT 设备 OTA 升级 Vertx Handler
+ *
+ * 芋道源码
+ */
@Slf4j
@RequiredArgsConstructor
public class IotDeviceOtaUpgradeVertxHandler implements Handler {
diff --git a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/downstream/router/IotDevicePropertyGetVertxHandler.java b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/downstream/router/IotDevicePropertyGetVertxHandler.java
index 5f9906fdc2..2e99a1b626 100644
--- a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/downstream/router/IotDevicePropertyGetVertxHandler.java
+++ b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/downstream/router/IotDevicePropertyGetVertxHandler.java
@@ -16,7 +16,7 @@ import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeC
import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR;
/**
- * IOT 设备服务获取 Vertx Handler
+ * IoT 设备服务获取 Vertx Handler
*
* 芋道源码
*/
diff --git a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/downstream/router/IotDevicePropertySetVertxHandler.java b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/downstream/router/IotDevicePropertySetVertxHandler.java
index c8a60c7708..ddcebccffb 100644
--- a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/downstream/router/IotDevicePropertySetVertxHandler.java
+++ b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/downstream/router/IotDevicePropertySetVertxHandler.java
@@ -16,7 +16,7 @@ import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeC
import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR;
/**
- * IOT 设备服务设置 Vertx Handler
+ * IoT 设置设备属性 Vertx Handler
*
* 芋道源码
*/
diff --git a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/downstream/router/IotDeviceServiceInvokeVertxHandler.java b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/downstream/router/IotDeviceServiceInvokeVertxHandler.java
index 421fe7484a..c4fd2e5044 100644
--- a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/downstream/router/IotDeviceServiceInvokeVertxHandler.java
+++ b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/downstream/router/IotDeviceServiceInvokeVertxHandler.java
@@ -5,17 +5,18 @@ import cn.iocoder.yudao.module.iot.api.device.dto.control.downstream.IotDeviceSe
import cn.iocoder.yudao.module.iot.plugin.common.downstream.IotDeviceDownstreamHandler;
import cn.iocoder.yudao.module.iot.plugin.common.util.IotPluginCommonUtils;
import io.vertx.core.Handler;
+import io.vertx.core.json.JsonObject;
import io.vertx.ext.web.RoutingContext;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import io.vertx.core.json.JsonObject;
+
import java.util.Map;
import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR;
/**
- * IOT 设备服务调用 Vertx Handler
+ * IoT 设备服务调用 Vertx Handler
*
* 芋道源码
*/
diff --git a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/heartbeat/IotPluginInstanceHeartbeatJob.java b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/heartbeat/IotPluginInstanceHeartbeatJob.java
index 238d34f98a..f272468c56 100644
--- a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/heartbeat/IotPluginInstanceHeartbeatJob.java
+++ b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/heartbeat/IotPluginInstanceHeartbeatJob.java
@@ -4,6 +4,7 @@ import cn.hutool.system.SystemUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.iot.api.device.IotDeviceUpstreamApi;
import cn.iocoder.yudao.module.iot.api.device.dto.control.upstream.IotPluginInstanceHeartbeatReqDTO;
+import cn.iocoder.yudao.module.iot.plugin.common.config.IotPluginCommonProperties;
import cn.iocoder.yudao.module.iot.plugin.common.downstream.IotDeviceDownstreamServer;
import cn.iocoder.yudao.module.iot.plugin.common.util.IotPluginCommonUtils;
import lombok.RequiredArgsConstructor;
@@ -23,6 +24,7 @@ public class IotPluginInstanceHeartbeatJob {
private final IotDeviceUpstreamApi deviceUpstreamApi;
private final IotDeviceDownstreamServer deviceDownstreamServer;
+ private final IotPluginCommonProperties commonProperties;
public void init() {
CommonResult result = deviceUpstreamApi.heartbeatPluginInstance(buildPluginInstanceHeartbeatReqDTO(true));
@@ -41,9 +43,8 @@ public class IotPluginInstanceHeartbeatJob {
}
private IotPluginInstanceHeartbeatReqDTO buildPluginInstanceHeartbeatReqDTO(Boolean online) {
- // TODO @haohao：pluginKey 的获取？？？
return new IotPluginInstanceHeartbeatReqDTO()
- .setPluginKey("yudao-module-iot-plugin-http").setProcessId(IotPluginCommonUtils.getProcessId())
+ .setPluginKey(commonProperties.getPluginKey()).setProcessId(IotPluginCommonUtils.getProcessId())
.setHostIp(SystemUtil.getHostInfo().getAddress()).setDownstreamPort(deviceDownstreamServer.getPort())
.setOnline(online);
}
diff --git a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/upstream/IotDeviceUpstreamClient.java b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/upstream/IotDeviceUpstreamClient.java
index ec662510ba..1bf4d676c0 100644
--- a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/upstream/IotDeviceUpstreamClient.java
+++ b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/upstream/IotDeviceUpstreamClient.java
@@ -57,6 +57,12 @@ public class IotDeviceUpstreamClient implements IotDeviceUpstreamApi {
return null;
}
+ @Override
+ public CommonResult authenticateEmqxConnection(IotDeviceEmqxAuthReqDTO authReqDTO) {
+ String url = properties.getUpstreamUrl() + URL_PREFIX + "/authenticate-emqx-connection";
+ return doPost(url, authReqDTO);
+ }
+
@Override
public CommonResult reportDeviceProperty(IotDevicePropertyReportReqDTO reportReqDTO) {
String url = properties.getUpstreamUrl() + URL_PREFIX + "/report-property";
diff --git a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/util/IotPluginCommonUtils.java b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/util/IotPluginCommonUtils.java
index f93717386e..a632c73c70 100644
--- a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/util/IotPluginCommonUtils.java
+++ b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/util/IotPluginCommonUtils.java
@@ -41,4 +41,12 @@ public class IotPluginCommonUtils {
.end(JsonUtils.toJsonString(result));
}
+ @SuppressWarnings("deprecation")
+ public static void writeJson(RoutingContext routingContext, String result) {
+ routingContext.response()
+ .setStatusCode(200)
+ .putHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_UTF8_VALUE)
+ .end(result);
+ }
+
}
diff --git a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/plugin.properties b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/plugin.properties
index 7f565b75e9..565e81eb06 100644
--- a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/plugin.properties
+++ b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/plugin.properties
@@ -1,6 +1,6 @@
-plugin.id=plugin-emqx
-plugin.class=cn.iocoder.yudao.module.iot.plugin.EmqxPlugin
+plugin.id=yudao-module-iot-plugin-emqx
+plugin.class=cn.iocoder.yudao.module.iot.plugin.emqx.config.IotEmqxPlugin
plugin.version=1.0.0
-plugin.provider=ahh
+plugin.provider=yudao
plugin.dependencies=
-plugin.description=plugin-emqx-1.0.0
+plugin.description=yudao-module-iot-plugin-emqx-1.0.0
diff --git a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/pom.xml b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/pom.xml
index cd89743214..818c08b333 100644
--- a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/pom.xml
+++ b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/pom.xml
@@ -12,6 +12,7 @@
jar
yudao-module-iot-plugin-emqx
+ 1.0.0
${project.artifactId}
@@ -21,36 +22,16 @@
emqx-plugin
- cn.iocoder.yudao.module.iot.plugin.EmqxPlugin
- 0.0.1
- ahh
- emqx-plugin-0.0.1
+ cn.iocoder.yudao.module.iot.plugin.emqx.config.IotEmqxPlugin
+ ${project.version}
+ yudao
+ ${project.artifactId}-${project.version}
-
-
+
org.apache.maven.plugins
maven-antrun-plugin
@@ -94,6 +75,7 @@
+
org.apache.maven.plugins
maven-jar-plugin
@@ -111,54 +93,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- maven-deploy-plugin
-
- true
-
+ org.springframework.boot
+ spring-boot-maven-plugin
+ ${spring.boot.version}
+
+
+
+ repackage
+
+
+ -standalone
+
+
+
+
-
+
+ cn.iocoder.boot
+ yudao-module-iot-plugin-common
+ ${revision}
+
+
+
org.springframework.boot
spring-boot-starter-web
-
-
- org.pf4j
- pf4j-spring
- provided
-
-
-
- cn.iocoder.boot
- yudao-module-iot-api
- ${revision}
-
-
- org.projectlombok
- lombok
- ${lombok.version}
- provided
-
-
-
- io.vertx
- vertx-core
-
-
+
+
io.vertx
vertx-web
-
- org.eclipse.paho
- org.eclipse.paho.client.mqttv3
+ io.vertx
+ vertx-mqtt
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/EmqxPlugin.java b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/EmqxPlugin.java
deleted file mode 100644
index b5fed5518b..0000000000
--- a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/EmqxPlugin.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package cn.iocoder.yudao.module.iot.plugin;
-
-import cn.hutool.extra.spring.SpringUtil;
-import cn.iocoder.yudao.module.iot.api.device.IotDeviceUpstreamApi;
-import lombok.extern.slf4j.Slf4j;
-import org.pf4j.Plugin;
-import org.pf4j.PluginWrapper;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-@Slf4j
-public class EmqxPlugin extends Plugin {
-
- private ExecutorService executorService;
-
- public EmqxPlugin(PluginWrapper wrapper) {
- super(wrapper);
- this.executorService = Executors.newSingleThreadExecutor();
- }
-
- @Override
- public void start() {
- log.info("EmqxPlugin.start()");
-
- if (executorService.isShutdown() || executorService.isTerminated()) {
- executorService = Executors.newSingleThreadExecutor();
- }
-
- IotDeviceUpstreamApi deviceDataApi = SpringUtil.getBean(IotDeviceUpstreamApi.class);
- if (deviceDataApi == null) {
- log.error("未能从 ServiceRegistry 获取 DeviceDataApi 实例，请确保主程序已正确注册！");
- return;
- }
-
- }
-
- @Override
- public void stop() {
- log.info("EmqxPlugin.stop()");
- }
-}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/IotEmqxPluginApplication.java b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/IotEmqxPluginApplication.java
new file mode 100644
index 0000000000..1780384175
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/IotEmqxPluginApplication.java
@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.iot.plugin.emqx;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.WebApplicationType;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * IoT Emqx 插件的独立运行入口
+ */
+@Slf4j
+@SpringBootApplication
+public class IotEmqxPluginApplication {
+
+ public static void main(String[] args) {
+ SpringApplication application = new SpringApplication(IotEmqxPluginApplication.class);
+ application.setWebApplicationType(WebApplicationType.NONE);
+ application.run(args);
+ log.info("[main][独立模式启动完成]");
+ }
+
+}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/config/IotEmqxPlugin.java b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/config/IotEmqxPlugin.java
new file mode 100644
index 0000000000..af2e568628
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/config/IotEmqxPlugin.java
@@ -0,0 +1,57 @@
+package cn.iocoder.yudao.module.iot.plugin.emqx.config;
+
+import cn.hutool.extra.spring.SpringUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.pf4j.PluginWrapper;
+import org.pf4j.spring.SpringPlugin;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+
+// TODO @芋艿：完善注释
+
+/**
+ * 负责插件的启动和停止
+ */
+@Slf4j
+public class IotEmqxPlugin extends SpringPlugin {
+
+ public IotEmqxPlugin(PluginWrapper wrapper) {
+ super(wrapper);
+ }
+
+ @Override
+ public void start() {
+ log.info("[EmqxPlugin][EmqxPlugin 插件启动开始...]");
+ try {
+
+ log.info("[EmqxPlugin][EmqxPlugin 插件启动成功...]");
+ } catch (Exception e) {
+ log.error("[EmqxPlugin][EmqxPlugin 插件开启动异常...]", e);
+ }
+ }
+
+ @Override
+ public void stop() {
+ log.info("[EmqxPlugin][EmqxPlugin 插件停止开始...]");
+ try {
+ log.info("[EmqxPlugin][EmqxPlugin 插件停止成功...]");
+ } catch (Exception e) {
+ log.error("[EmqxPlugin][EmqxPlugin 插件停止异常...]", e);
+ }
+ }
+
+ @Override
+ protected ApplicationContext createApplicationContext() {
+ // 创建插件自己的 ApplicationContext
+ AnnotationConfigApplicationContext pluginContext = new AnnotationConfigApplicationContext();
+ // 设置父容器为主应用的 ApplicationContext （确保主应用中提供的类可用）
+ pluginContext.setParent(SpringUtil.getApplicationContext());
+ // 继续使用插件自己的 ClassLoader 以加载插件内部的类
+ pluginContext.setClassLoader(getWrapper().getPluginClassLoader());
+ // 扫描当前插件的自动配置包
+ pluginContext.scan("cn.iocoder.yudao.module.iot.plugin.emqx.config");
+ pluginContext.refresh();
+ return pluginContext;
+ }
+
+}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/config/IotPluginEmqxAutoConfiguration.java b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/config/IotPluginEmqxAutoConfiguration.java
new file mode 100644
index 0000000000..d504e5704f
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/config/IotPluginEmqxAutoConfiguration.java
@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.iot.plugin.emqx.config;
+
+import cn.iocoder.yudao.module.iot.api.device.IotDeviceUpstreamApi;
+import cn.iocoder.yudao.module.iot.plugin.common.downstream.IotDeviceDownstreamHandler;
+import cn.iocoder.yudao.module.iot.plugin.emqx.downstream.IotDeviceDownstreamHandlerImpl;
+import cn.iocoder.yudao.module.iot.plugin.emqx.upstream.IotDeviceUpstreamServer;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * IoT 插件 Emqx 的专用自动配置类
+ *
+ * @author haohao
+ */
+@Configuration
+@EnableConfigurationProperties(IotPluginEmqxProperties.class)
+public class IotPluginEmqxAutoConfiguration {
+
+ @Bean(initMethod = "start", destroyMethod = "stop")
+ public IotDeviceUpstreamServer deviceUpstreamServer(IotDeviceUpstreamApi deviceUpstreamApi,
+ IotPluginEmqxProperties emqxProperties) {
+ return new IotDeviceUpstreamServer(emqxProperties, deviceUpstreamApi);
+ }
+
+ @Bean
+ public IotDeviceDownstreamHandler deviceDownstreamHandler() {
+ return new IotDeviceDownstreamHandlerImpl();
+ }
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/config/IotPluginEmqxProperties.java b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/config/IotPluginEmqxProperties.java
new file mode 100644
index 0000000000..fbc689b353
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/config/IotPluginEmqxProperties.java
@@ -0,0 +1,49 @@
+package cn.iocoder.yudao.module.iot.plugin.emqx.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.validation.annotation.Validated;
+
+/**
+ * 物联网插件 - EMQX 配置
+ *
+ * @author 芋道源码
+ */
+@ConfigurationProperties(prefix = "yudao.iot.plugin.emqx")
+@Validated
+@Data
+public class IotPluginEmqxProperties {
+
+ /**
+ * 服务主机
+ */
+ private String mqttHost;
+ /**
+ * 服务端口
+ */
+ private int mqttPort;
+ /**
+ * 服务用户名
+ */
+ private String mqttUsername;
+
+ /**
+ * 服务密码
+ */
+ private String mqttPassword;
+ /**
+ * 是否启用 SSL
+ */
+ private boolean mqttSsl;
+
+ /**
+ * 订阅的主题
+ */
+ private String mqttTopics;
+
+ /**
+ * 认证端口
+ */
+ private int authPort;
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/downstream/IotDeviceDownstreamHandlerImpl.java b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/downstream/IotDeviceDownstreamHandlerImpl.java
new file mode 100644
index 0000000000..b1a8eebbf4
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/downstream/IotDeviceDownstreamHandlerImpl.java
@@ -0,0 +1,46 @@
+package cn.iocoder.yudao.module.iot.plugin.emqx.downstream;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.iot.api.device.dto.control.downstream.*;
+import cn.iocoder.yudao.module.iot.plugin.common.downstream.IotDeviceDownstreamHandler;
+
+/**
+ * EMQX 插件的 {@link IotDeviceDownstreamHandler} 实现类
+ *
+ *
+ * @author 芋道源码
+ */
+public class IotDeviceDownstreamHandlerImpl implements IotDeviceDownstreamHandler {
+
+ @Override
+ public CommonResult invokeDeviceService(IotDeviceServiceInvokeReqDTO invokeReqDTO) {
+ // 设备服务调用
+ // 请求Topic：/sys/${productKey}/${deviceName}/thing/service/${tsl.service.identifier}
+ // 响应Topic：/sys/${productKey}/${deviceName}/thing/service/${tsl.service.identifier}_reply
+ return CommonResult.success(true);
+ }
+
+ @Override
+ public CommonResult getDeviceProperty(IotDevicePropertyGetReqDTO getReqDTO) {
+ return CommonResult.success(true);
+ }
+
+ @Override
+ public CommonResult setDeviceProperty(IotDevicePropertySetReqDTO setReqDTO) {
+ // 设置设备属性 标准 JSON
+ // 请求Topic：/sys/${productKey}/${deviceName}/thing/service/property/set
+ // 响应Topic：/sys/${productKey}/${deviceName}/thing/service/property/set_reply
+ return CommonResult.success(true);
+ }
+
+ @Override
+ public CommonResult setDeviceConfig(IotDeviceConfigSetReqDTO setReqDTO) {
+ return CommonResult.success(true);
+ }
+
+ @Override
+ public CommonResult upgradeDeviceOta(IotDeviceOtaUpgradeReqDTO upgradeReqDTO) {
+ return CommonResult.success(true);
+ }
+
+}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/upstream/IotDeviceUpstreamServer.java b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/upstream/IotDeviceUpstreamServer.java
new file mode 100644
index 0000000000..baeddcb152
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/upstream/IotDeviceUpstreamServer.java
@@ -0,0 +1,164 @@
+package cn.iocoder.yudao.module.iot.plugin.emqx.upstream;
+
+import cn.hutool.core.util.IdUtil;
+import cn.iocoder.yudao.module.iot.api.device.IotDeviceUpstreamApi;
+import cn.iocoder.yudao.module.iot.plugin.emqx.config.IotPluginEmqxProperties;
+import cn.iocoder.yudao.module.iot.plugin.emqx.upstream.router.IotDeviceAuthVertxHandler;
+import cn.iocoder.yudao.module.iot.plugin.emqx.upstream.router.IotDeviceMqttMessageHandler;
+import io.netty.handler.codec.mqtt.MqttQoS;
+import io.vertx.core.Vertx;
+import io.vertx.core.http.HttpServer;
+import io.vertx.ext.web.Router;
+import io.vertx.ext.web.handler.BodyHandler;
+import io.vertx.mqtt.MqttClient;
+import io.vertx.mqtt.MqttClientOptions;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * IoT 设备下行服务端，接收来自 device 设备的请求，转发给 server 服务器
+ *
+ * 协议：HTTP、MQTT
+ *
+ * @author haohao
+ */
+@Slf4j
+public class IotDeviceUpstreamServer {
+
+ private static final int RECONNECT_DELAY = 5000; // 重连延迟时间(毫秒)
+
+ private final Vertx vertx;
+ private final HttpServer server;
+ private final MqttClient client;
+ private final IotPluginEmqxProperties emqxProperties;
+ private final IotDeviceMqttMessageHandler mqttMessageHandler;
+
+ public IotDeviceUpstreamServer(IotPluginEmqxProperties emqxProperties,
+ IotDeviceUpstreamApi deviceUpstreamApi) {
+ this.emqxProperties = emqxProperties;
+
+ // 创建 Vertx 实例
+ this.vertx = Vertx.vertx();
+ // 创建 Router 实例
+ Router router = Router.router(vertx);
+ router.route().handler(BodyHandler.create()); // 处理 Body
+ router.post(IotDeviceAuthVertxHandler.PATH)
+ .handler(new IotDeviceAuthVertxHandler(deviceUpstreamApi));
+ // 创建 HttpServer 实例
+ this.server = vertx.createHttpServer().requestHandler(router);
+
+ // 创建 MQTT 客户端
+ MqttClientOptions options = new MqttClientOptions()
+ .setClientId("yudao-iot-server-" + IdUtil.fastSimpleUUID())
+ .setUsername(emqxProperties.getMqttUsername())
+ .setPassword(emqxProperties.getMqttPassword())
+ .setSsl(emqxProperties.isMqttSsl());
+ client = MqttClient.create(vertx, options);
+ this.mqttMessageHandler = new IotDeviceMqttMessageHandler(deviceUpstreamApi, client);
+ }
+
+ /**
+ * 启动 HTTP 服务器、MQTT 客户端
+ */
+ public void start() {
+ // 1. 启动 HTTP 服务器
+ log.info("[start][开始启动]");
+ server.listen(emqxProperties.getAuthPort())
+ .toCompletionStage()
+ .toCompletableFuture()
+ .join();
+ log.info("[start][HTTP服务器启动完成，端口({})]", this.server.actualPort());
+
+ // 2. 连接 MQTT Broker
+ connectMqtt();
+
+ // 3. 添加 MQTT 断开重连监听器
+ client.closeHandler(v -> {
+ log.warn("[closeHandler][MQTT 连接已断开，准备重连]");
+ reconnectWithDelay();
+ });
+
+ // 4. 设置 MQTT 消息处理器
+ setupMessageHandler();
+ }
+
+ /**
+ * 设置 MQTT 消息处理器
+ */
+ private void setupMessageHandler() {
+ client.publishHandler(mqttMessageHandler::handle);
+ }
+
+ /**
+ * 重连 MQTT 客户端
+ */
+ private void reconnectWithDelay() {
+ vertx.setTimer(RECONNECT_DELAY, id -> {
+ log.info("[reconnectWithDelay][开始重新连接 MQTT]");
+ connectMqtt();
+ });
+ }
+
+ /**
+ * 连接 MQTT Broker 并订阅主题
+ */
+ private void connectMqtt() {
+ client.connect(emqxProperties.getMqttPort(), emqxProperties.getMqttHost())
+ .onSuccess(connAck -> {
+ log.info("[connectMqtt][MQTT客户端连接成功]");
+ subscribeToTopics();
+ })
+ .onFailure(err -> {
+ log.error("[connectMqtt][连接 MQTT Broker 失败]", err);
+ reconnectWithDelay();
+ });
+ }
+
+ /**
+ * 订阅设备上行消息主题
+ */
+ private void subscribeToTopics() {
+ String[] topics = emqxProperties.getMqttTopics().split(",");
+ for (String topic : topics) {
+ client.subscribe(topic, MqttQoS.AT_LEAST_ONCE.value())
+ .onSuccess(v -> log.info("[subscribeToTopics][成功订阅主题: {}]", topic))
+ .onFailure(err -> log.error("[subscribeToTopics][订阅主题失败: {}]", topic, err));
+ }
+ log.info("[subscribeToTopics][开始订阅设备上行消息主题]");
+ }
+
+ /**
+ * 停止所有
+ */
+ public void stop() {
+ log.info("[stop][开始关闭]");
+ try {
+ // 关闭 HTTP 服务器
+ if (server != null) {
+ server.close()
+ .toCompletionStage()
+ .toCompletableFuture()
+ .join();
+ }
+
+ // 关闭 MQTT 客户端
+ if (client != null) {
+ client.disconnect()
+ .toCompletionStage()
+ .toCompletableFuture()
+ .join();
+ }
+
+ // 关闭 Vertx 实例
+ if (vertx != null) {
+ vertx.close()
+ .toCompletionStage()
+ .toCompletableFuture()
+ .join();
+ }
+ log.info("[stop][关闭完成]");
+ } catch (Exception e) {
+ log.error("[stop][关闭异常]", e);
+ throw new RuntimeException(e);
+ }
+ }
+}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/upstream/router/IotDeviceAuthVertxHandler.java b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/upstream/router/IotDeviceAuthVertxHandler.java
new file mode 100644
index 0000000000..794949c287
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/upstream/router/IotDeviceAuthVertxHandler.java
@@ -0,0 +1,54 @@
+package cn.iocoder.yudao.module.iot.plugin.emqx.upstream.router;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.iot.api.device.IotDeviceUpstreamApi;
+import cn.iocoder.yudao.module.iot.api.device.dto.control.upstream.IotDeviceEmqxAuthReqDTO;
+import cn.iocoder.yudao.module.iot.plugin.common.util.IotPluginCommonUtils;
+import io.vertx.core.Handler;
+import io.vertx.core.json.JsonObject;
+import io.vertx.ext.web.RoutingContext;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * IoT Emqx 连接认证的 Vert.x Handler
+ * ...
+ *
+ * @author haohao
+ */
+@RequiredArgsConstructor
+@Slf4j
+public class IotDeviceAuthVertxHandler implements Handler {
+
+ public static final String PATH = "/mqtt/auth";
+
+ private final IotDeviceUpstreamApi deviceUpstreamApi;
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public void handle(RoutingContext routingContext) {
+
+ JsonObject json = routingContext.body().asJsonObject();
+ String clientId = json.getString("clientid");
+ String username = json.getString("username");
+ String password = json.getString("password");
+
+ IotDeviceEmqxAuthReqDTO authReqDTO = buildDeviceEmqxAuthReqDTO(clientId, username, password);
+
+ CommonResult authResult = deviceUpstreamApi.authenticateEmqxConnection(authReqDTO);
+ if (authResult.getCode() != 0 || !authResult.getData()) {
+ denyAccess(routingContext);
+ return;
+ }
+ IotPluginCommonUtils.writeJson(routingContext, "{\"result\": \"allow\"}");
+ }
+
+ private void denyAccess(RoutingContext routingContext) {
+ IotPluginCommonUtils.writeJson(routingContext, "{\"result\": \"deny\"}");
+ }
+
+ private IotDeviceEmqxAuthReqDTO buildDeviceEmqxAuthReqDTO(String clientId, String username, String password) {
+ return new IotDeviceEmqxAuthReqDTO().setClientId(clientId).setUsername(username).setPassword(password);
+ }
+
+}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/upstream/router/IotDeviceMqttMessageHandler.java b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/upstream/router/IotDeviceMqttMessageHandler.java
new file mode 100644
index 0000000000..6b99d781a4
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/upstream/router/IotDeviceMqttMessageHandler.java
@@ -0,0 +1,194 @@
+package cn.iocoder.yudao.module.iot.plugin.emqx.upstream.router;
+
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import cn.iocoder.yudao.module.iot.api.device.IotDeviceUpstreamApi;
+import cn.iocoder.yudao.module.iot.api.device.dto.control.upstream.IotDeviceEventReportReqDTO;
+import cn.iocoder.yudao.module.iot.api.device.dto.control.upstream.IotDevicePropertyReportReqDTO;
+import cn.iocoder.yudao.module.iot.plugin.common.util.IotPluginCommonUtils;
+import io.netty.handler.codec.mqtt.MqttQoS;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.mqtt.MqttClient;
+import io.vertx.mqtt.messages.MqttPublishMessage;
+import lombok.extern.slf4j.Slf4j;
+
+import java.time.LocalDateTime;
+
+/**
+ * IoT 设备 MQTT 消息处理器
+ *
+ * 参考：
+ *
+ * "...">
+ */
+@Slf4j
+public class IotDeviceMqttMessageHandler {
+
+ // 设备上报属性 标准 JSON
+ // 请求Topic：/sys/${productKey}/${deviceName}/thing/event/property/post
+ // 响应Topic：/sys/${productKey}/${deviceName}/thing/event/property/post_reply
+ // 设备上报事件 标准 JSON
+ // 请求Topic：/sys/${productKey}/${deviceName}/thing/event/${tsl.event.identifier}/post
+ // 响应Topic：/sys/${productKey}/${deviceName}/thing/event/${tsl.event.identifier}/post_reply
+
+ private static final String SYS_TOPIC_PREFIX = "/sys/";
+ private static final String PROPERTY_POST_TOPIC = "/thing/event/property/post";
+ private static final String EVENT_POST_TOPIC_PREFIX = "/thing/event/";
+ private static final String EVENT_POST_TOPIC_SUFFIX = "/post";
+
+ private final IotDeviceUpstreamApi deviceUpstreamApi;
+ private final MqttClient mqttClient;
+
+ public IotDeviceMqttMessageHandler(IotDeviceUpstreamApi deviceUpstreamApi, MqttClient mqttClient) {
+ this.deviceUpstreamApi = deviceUpstreamApi;
+ this.mqttClient = mqttClient;
+ }
+
+ public void handle(MqttPublishMessage message) {
+ String topic = message.topicName();
+ String payload = message.payload().toString();
+ log.info("[messageHandler][接收到消息][topic: {}][payload: {}]", topic, payload);
+
+ try {
+ handleMessage(topic, payload);
+ } catch (Exception e) {
+ log.error("[messageHandler][处理消息失败][topic: {}][payload: {}]", topic, payload, e);
+ }
+ }
+
+ private void handleMessage(String topic, String payload) {
+ // 校验前缀
+ if (!topic.startsWith(SYS_TOPIC_PREFIX)) {
+ log.warn("[handleMessage][未知的消息类型][topic: {}]", topic);
+ return;
+ }
+
+ // 处理设备属性上报消息
+ if (topic.endsWith(PROPERTY_POST_TOPIC)) {
+ log.info("[handleMessage][接收到设备属性上报][topic: {}]", topic);
+ handlePropertyPost(topic, payload);
+ return;
+ }
+
+ // 处理设备事件上报消息
+ if (topic.contains(EVENT_POST_TOPIC_PREFIX) && topic.endsWith(EVENT_POST_TOPIC_SUFFIX)) {
+ log.info("[handleMessage][接收到设备事件上报][topic: {}]", topic);
+ handleEventPost(topic, payload);
+ return;
+ }
+
+ // 未知消息类型
+ log.warn("[handleMessage][未知的消息类型][topic: {}]", topic);
+ }
+
+ /**
+ * 处理设备属性上报消息
+ *
+ * @param topic 主题
+ * @param payload 消息内容
+ */
+ private void handlePropertyPost(String topic, String payload) {
+ // 解析消息内容
+ JSONObject jsonObject = JSONUtil.parseObj(payload);
+ String[] topicParts = topic.split("/");
+
+ // 构建设备属性上报请求对象
+ IotDevicePropertyReportReqDTO reportReqDTO = buildPropertyReportDTO(jsonObject, topicParts);
+
+ // 调用上游 API 处理设备上报数据
+ deviceUpstreamApi.reportDeviceProperty(reportReqDTO);
+ log.info("[handlePropertyPost][处理设备上行消息成功][topic: {}][reportReqDTO: {}]",
+ topic, JSONUtil.toJsonStr(reportReqDTO));
+
+ // 发送响应消息
+ String replyTopic = topic + "_reply";
+ JSONObject response = new JSONObject()
+ .set("id", jsonObject.getStr("id"))
+ .set("code", 200)
+ .set("data", new JSONObject())
+ .set("message", "success")
+ .set("method", "thing.event.property.post");
+
+ mqttClient.publish(replyTopic,
+ Buffer.buffer(response.toString()),
+ MqttQoS.AT_LEAST_ONCE,
+ false,
+ false);
+ log.info("[handlePropertyPost][发送响应消息成功][topic: {}][response: {}]",
+ replyTopic, response.toString());
+ }
+
+ /**
+ * 处理设备事件上报消息
+ *
+ * @param topic 主题
+ * @param payload 消息内容
+ */
+ private void handleEventPost(String topic, String payload) {
+ // 解析消息内容
+ JSONObject jsonObject = JSONUtil.parseObj(payload);
+ String[] topicParts = topic.split("/");
+
+ // 构建设备事件上报请求对象
+ IotDeviceEventReportReqDTO reportReqDTO = buildEventReportDTO(jsonObject, topicParts);
+
+ // 调用上游 API 处理设备上报数据
+ deviceUpstreamApi.reportDeviceEvent(reportReqDTO);
+ log.info("[handleEventPost][处理设备上行消息成功][topic: {}][reportReqDTO: {}]",
+ topic, JSONUtil.toJsonStr(reportReqDTO));
+
+ // 发送响应消息
+ String replyTopic = topic + "_reply";
+ String eventIdentifier = topicParts[6]; // 从 topic 中获取事件标识符
+ JSONObject response = new JSONObject()
+ .set("id", jsonObject.getStr("id"))
+ .set("code", 200)
+ .set("data", new JSONObject())
+ .set("message", "success")
+ .set("method", "thing.event." + eventIdentifier + ".post");
+
+ mqttClient.publish(replyTopic,
+ Buffer.buffer(response.toString()),
+ MqttQoS.AT_LEAST_ONCE,
+ false,
+ false);
+ log.info("[handleEventPost][发送响应消息成功][topic: {}][response: {}]",
+ replyTopic, response.toString());
+ }
+
+ /**
+ * 构建设备属性上报请求对象
+ *
+ * @param jsonObject 消息内容
+ * @param topicParts 主题部分
+ * @return 设备属性上报请求对象
+ */
+ private IotDevicePropertyReportReqDTO buildPropertyReportDTO(JSONObject jsonObject,
+ String[] topicParts) {
+ return ((IotDevicePropertyReportReqDTO) new IotDevicePropertyReportReqDTO()
+ .setRequestId(jsonObject.getStr("id"))
+ .setProcessId(IotPluginCommonUtils.getProcessId())
+ .setReportTime(LocalDateTime.now())
+ .setProductKey(topicParts[2])
+ .setDeviceName(topicParts[3]))
+ .setProperties(jsonObject.getJSONObject("params"));
+ }
+
+ /**
+ * 构建设备事件上报请求对象
+ *
+ * @param jsonObject 消息内容
+ * @param topicParts 主题部分
+ * @return 设备事件上报请求对象
+ */
+ private IotDeviceEventReportReqDTO buildEventReportDTO(JSONObject jsonObject, String[] topicParts) {
+ return ((IotDeviceEventReportReqDTO) new IotDeviceEventReportReqDTO()
+ .setRequestId(jsonObject.getStr("id"))
+ .setProcessId(IotPluginCommonUtils.getProcessId())
+ .setReportTime(LocalDateTime.now())
+ .setProductKey(topicParts[2])
+ .setDeviceName(topicParts[3]))
+ .setIdentifier(topicParts[4])
+ .setParams(jsonObject.getJSONObject("params"));
+ }
+}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/resources/application.yml b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/resources/application.yml
new file mode 100644
index 0000000000..9343d3614e
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/resources/application.yml
@@ -0,0 +1,19 @@
+spring:
+ application:
+ name: yudao-module-iot-plugin-emqx
+
+yudao:
+ iot:
+ plugin:
+ common:
+ upstream-url: http://127.0.0.1:48080
+ downstream-port: 8100
+ plugin-key: yudao-module-iot-plugin-emqx
+ emqx:
+ mqtt-host: 127.0.0.1
+ mqtt-port: 1883
+ mqtt-ssl: false
+ mqtt-username: yudao
+ mqtt-password: 123456
+ mqtt-topics: "/sys/#"
+ auth-port: 8101
diff --git a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-http/src/main/java/cn/iocoder/yudao/module/iot/plugin/http/upstream/router/IotDeviceEventReportVertxHandler.java b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-http/src/main/java/cn/iocoder/yudao/module/iot/plugin/http/upstream/router/IotDeviceEventReportVertxHandler.java
index 4e0a2ef448..bdb92b6ee7 100644
--- a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-http/src/main/java/cn/iocoder/yudao/module/iot/plugin/http/upstream/router/IotDeviceEventReportVertxHandler.java
+++ b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-http/src/main/java/cn/iocoder/yudao/module/iot/plugin/http/upstream/router/IotDeviceEventReportVertxHandler.java
@@ -21,7 +21,7 @@ import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeC
import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR;
/**
- * IoT 设备设备上报的 Vert.x Handler
+ * IoT 设备事件上报的 Vert.x Handler
*/
@RequiredArgsConstructor
@Slf4j
diff --git a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-http/src/main/resources/application.yml b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-http/src/main/resources/application.yml
index 4afeb4f26f..f195628a6a 100644
--- a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-http/src/main/resources/application.yml
+++ b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-http/src/main/resources/application.yml
@@ -8,5 +8,6 @@ yudao:
common:
upstream-url: http://127.0.0.1:48080
downstream-port: 8093
+ plugin-key: yudao-module-iot-plugin-http
http:
server-port: 8092
diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml
index 047238dd20..aea19a5e9d 100644
--- a/yudao-server/src/main/resources/application-local.yaml
+++ b/yudao-server/src/main/resources/application-local.yaml
@@ -267,23 +267,6 @@ justauth:
timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟
--- #################### iot相关配置 TODO 芋艿：再瞅瞅 ####################
-iot:
- emq:
- # 账号
- username: haohao
- # 密码
- password: ahh@123456
- # 主机地址
- hostUrl: tcp://chaojiniu.top:1883
- # 客户端Id，不能相同，采用随机数 ${random.value}
- client-id: ${random.int}
- # 默认主题
- default-topic: test
- # 保持连接
- keepalive: 60
- # 清除会话(设置为false,断开连接，重连后使用原来的会话 保留订阅的主题，能接收离线期间的消息)
- clearSession: true
-
pf4j:
# pluginsDir: /tmp/
pluginsDir: ../plugins
\ No newline at end of file