From 65b70cf13a2ec91013d876771be878c165cae3a4 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Tue, 23 Apr 2024 15:32:45 +0800
Subject: [PATCH] fix：补充提交
---
screen-api/src/main/java/com/moral/api/controller/DataDisplayController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/DataDisplayController.java b/screen-api/src/main/java/com/moral/api/controller/DataDisplayController.java
index ef7c6fe..c4b0894 100644
--- a/screen-api/src/main/java/com/moral/api/controller/DataDisplayController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/DataDisplayController.java
@@ -32,10 +32,10 @@
@Autowired
DataDisplayService dataDisplayService;
- @GetMapping("monitorPointDataDisplay")
- public ResultMessage monitorPointDataDisplay(MonitorPointDataDisplayForm form){
+ @PostMapping("monitorPointDataDisplay")
+ public ResultMessage monitorPointDataDisplay( @RequestBody MonitorPointDataDisplayForm form){
//������������������������
- if (!form.valid())
+ if (form.getMacs()==null && form.getEndTime() ==null && form.getStartTime() ==null && form.getReportType()==null)
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
@@ -60,7 +60,7 @@
if (!params.containsKey("mac") || !params.containsKey("sensorCodes") || !params.containsKey("reportType") || !params.containsKey("times")) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
- List<SensorComparisonDisplayDTO> dtos = dataDisplayService.getSensorComparisonDisplayDataV2(params);
+ List<SensorComparisonDisplayDTO> dtos = dataDisplayService.getSensorComparisonDisplayDataV3(params);
return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),dtos);
}
--
Gitblit v1.8.0