From da4e29e96a1d01fd9fed34e8b1e993081c3fd450 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 22 Sep 2023 11:14:48 +0800
Subject: [PATCH] feat:补充提交
---
screen-api/src/main/java/com/moral/api/controller/DataDisplayController.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 1c3bb3a..91ccf70 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
@@ -13,6 +13,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Map;
/**
* @ClassName DataDisplayController
@@ -31,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());
@@ -53,4 +54,14 @@
return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),dtos);
}
+ @PostMapping("sensorComparisonDisplayV2")
+ public ResultMessage sensorComparisonDisplayV2(@RequestBody Map<String, Object> params){
+ //������������������������
+ 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);
+ return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),dtos);
+ }
+
}
--
Gitblit v1.8.0