boor/wanmao-map-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

对接第三方

Browse Source
This commit is contained in:
顾君禹
2025-09-10 18:03:48 +08:00
parent 8c003ab871
commit 8309edbdfa
5 changed files with 75 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexPageReqVO.java
View File

@@ -18,10 +18,10 @@ public class ModelEnvironmentIndexPageReqVO extends PageParam {
private String cycleId; private String cycleId;
@Schema(description = "设备分类") @Schema(description = "设备分类")
private String deviceClass; private Integer deviceClass;
@Schema(description = "环境指标") @Schema(description = "环境指标")
private String indicators; private Integer indicators;
@Schema(description = "最低值") @Schema(description = "最低值")
private BigDecimal minimum; private BigDecimal minimum;

4
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexRespVO.java
View File

@@ -23,11 +23,11 @@ public class ModelEnvironmentIndexRespVO {
@Schema(description = "设备分类") @Schema(description = "设备分类")
@ExcelProperty("设备分类") @ExcelProperty("设备分类")
private String deviceClass; private Integer deviceClass;
@Schema(description = "环境指标") @Schema(description = "环境指标")
@ExcelProperty("环境指标") @ExcelProperty("环境指标")
private String indicators; private Integer indicators;
@Schema(description = "最低值") @Schema(description = "最低值")
@ExcelProperty("最低值") @ExcelProperty("最低值")

4
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexSaveReqVO.java
View File

@@ -16,10 +16,10 @@ public class ModelEnvironmentIndexSaveReqVO {
private String cycleId; private String cycleId;
@Schema(description = "设备分类") @Schema(description = "设备分类")
private String deviceClass; private Integer deviceClass;
@Schema(description = "环境指标") @Schema(description = "环境指标")
private String indicators; private Integer indicators;
@Schema(description = "最低值") @Schema(description = "最低值")
private BigDecimal minimum; private BigDecimal minimum;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/mqtt/MqttTestController.java
View File

@@ -77,7 +77,7 @@ public class MqttTestController {
@PreAuthorize("@ss.hasPermission('farm:mqtt-connection:test')") @PreAuthorize("@ss.hasPermission('farm:mqtt-connection:test')")
public CommonResult<String> publishTest( public CommonResult<String> publishTest(
@PathVariable("deviceId") String deviceId, @PathVariable("deviceId") String deviceId,
@RequestParam(value = "message", defaultValue = "{\"temperature\":25.5,\"humidity\":60.2}") String message) { @RequestParam(value = "message") String message) {
try { try {
deviceMqttService.publishTelemetry(deviceId, message); deviceMqttService.publishTelemetry(deviceId, message);
return success("消息发送成功"); return success("消息发送成功");

5
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelenvironmentindex/ModelEnvironmentIndexDO.java
View File

@@ -37,12 +37,11 @@ public class ModelEnvironmentIndexDO extends BaseDO {
/** /**
* 设备分类 * 设备分类
*/ */
@DictFormat("device_class") private Integer deviceClass;
private String deviceClass;
/** /**
* 环境指标 * 环境指标
*/ */
private String indicators; private Integer indicators;
/** /**
* 最低值 * 最低值
*/ */