From 8309edbdfaef6f81f52a91c59d233c1ac1ab5553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A1=BE=E5=90=9B=E7=A6=B9?= <2673609096@qq.com> Date: Wed, 10 Sep 2025 18:03:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E7=AC=AC=E4=B8=89=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/ModelEnvironmentIndexPageReqVO.java | 4 +- .../vo/ModelEnvironmentIndexRespVO.java | 136 +++++++++--------- .../vo/ModelEnvironmentIndexSaveReqVO.java | 4 +- .../admin/mqtt/MqttTestController.java | 2 +- .../ModelEnvironmentIndexDO.java | 5 +- 5 files changed, 75 insertions(+), 76 deletions(-) diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexPageReqVO.java index b2e5a120..b861d808 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexPageReqVO.java @@ -18,10 +18,10 @@ public class ModelEnvironmentIndexPageReqVO extends PageParam { private String cycleId; @Schema(description = "设备分类") - private String deviceClass; + private Integer deviceClass; @Schema(description = "环境指标") - private String indicators; + private Integer indicators; @Schema(description = "最低值") private BigDecimal minimum; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexRespVO.java index dd8e97f8..fc142740 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexRespVO.java @@ -1,68 +1,68 @@ -package cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.math.BigDecimal; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; -import cn.idev.excel.annotation.*; - -@Schema(description = "管理后台 - 模型管理-环境指标 Response VO") -@Data -@ExcelIgnoreUnannotated -public class ModelEnvironmentIndexRespVO { - - @Schema(description = "基础id", requiredMode = Schema.RequiredMode.REQUIRED, example = "704") - @ExcelProperty("基础id") - private String id; - - @Schema(description = "周期id", example = "26426") - @ExcelProperty("周期id") - private String cycleId; - - @Schema(description = "设备分类") - @ExcelProperty("设备分类") - private String deviceClass; - - @Schema(description = "环境指标") - @ExcelProperty("环境指标") - private String indicators; - - @Schema(description = "最低值") - @ExcelProperty("最低值") - private BigDecimal minimum; - - @Schema(description = "最高值") - @ExcelProperty("最高值") - private BigDecimal maximum; - - @Schema(description = "预警摘要说明", example = "你猜") - @ExcelProperty("预警摘要说明") - private String description; - - @Schema(description = "创建时间") - @ExcelProperty("创建时间") - private LocalDateTime createTime; - - @Schema(description = "基地id", example = "23126") - @ExcelProperty("基地id") - private String baseId; - - @Schema(description = "基地", example = "李四") - @ExcelProperty("基地") - private String baseName; - - @Schema(description = "地块ID", example = "26021") - @ExcelProperty("地块ID") - private String plotId; - - @Schema(description = "地块", example = "王五") - @ExcelProperty("地块") - private String plotName; - - @Schema(description = "租户id", example = "20667") - @ExcelProperty("租户id") - private String tenantId; - -} \ No newline at end of file +package cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +import java.math.BigDecimal; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; +import cn.idev.excel.annotation.*; + +@Schema(description = "管理后台 - 模型管理-环境指标 Response VO") +@Data +@ExcelIgnoreUnannotated +public class ModelEnvironmentIndexRespVO { + + @Schema(description = "基础id", requiredMode = Schema.RequiredMode.REQUIRED, example = "704") + @ExcelProperty("基础id") + private String id; + + @Schema(description = "周期id", example = "26426") + @ExcelProperty("周期id") + private String cycleId; + + @Schema(description = "设备分类") + @ExcelProperty("设备分类") + private Integer deviceClass; + + @Schema(description = "环境指标") + @ExcelProperty("环境指标") + private Integer indicators; + + @Schema(description = "最低值") + @ExcelProperty("最低值") + private BigDecimal minimum; + + @Schema(description = "最高值") + @ExcelProperty("最高值") + private BigDecimal maximum; + + @Schema(description = "预警摘要说明", example = "你猜") + @ExcelProperty("预警摘要说明") + private String description; + + @Schema(description = "创建时间") + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @Schema(description = "基地id", example = "23126") + @ExcelProperty("基地id") + private String baseId; + + @Schema(description = "基地", example = "李四") + @ExcelProperty("基地") + private String baseName; + + @Schema(description = "地块ID", example = "26021") + @ExcelProperty("地块ID") + private String plotId; + + @Schema(description = "地块", example = "王五") + @ExcelProperty("地块") + private String plotName; + + @Schema(description = "租户id", example = "20667") + @ExcelProperty("租户id") + private String tenantId; + +} diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexSaveReqVO.java index 8e4eb1eb..37366b8b 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexSaveReqVO.java @@ -16,10 +16,10 @@ public class ModelEnvironmentIndexSaveReqVO { private String cycleId; @Schema(description = "设备分类") - private String deviceClass; + private Integer deviceClass; @Schema(description = "环境指标") - private String indicators; + private Integer indicators; @Schema(description = "最低值") private BigDecimal minimum; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/mqtt/MqttTestController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/mqtt/MqttTestController.java index 0717c7b0..37c1cef1 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/mqtt/MqttTestController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/mqtt/MqttTestController.java @@ -77,7 +77,7 @@ public class MqttTestController { @PreAuthorize("@ss.hasPermission('farm:mqtt-connection:test')") public CommonResult publishTest( @PathVariable("deviceId") String deviceId, - @RequestParam(value = "message", defaultValue = "{\"temperature\":25.5,\"humidity\":60.2}") String message) { + @RequestParam(value = "message") String message) { try { deviceMqttService.publishTelemetry(deviceId, message); return success("消息发送成功"); diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelenvironmentindex/ModelEnvironmentIndexDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelenvironmentindex/ModelEnvironmentIndexDO.java index 26ac2c0d..e9d95484 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelenvironmentindex/ModelEnvironmentIndexDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelenvironmentindex/ModelEnvironmentIndexDO.java @@ -37,12 +37,11 @@ public class ModelEnvironmentIndexDO extends BaseDO { /** * 设备分类 */ - @DictFormat("device_class") - private String deviceClass; + private Integer deviceClass; /** * 环境指标 */ - private String indicators; + private Integer indicators; /** * 最低值 */