From 68e22957db996437fa20a9a4aa5ff37c54d4056f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 27 Sep 2023 15:22:25 +0800
Subject: [PATCH] chore:补充提交
---
screen-api/src/main/java/com/moral/api/controller/DataDisplayController.java | 91 ++++++++++++++-------------------------------
1 files changed, 28 insertions(+), 63 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 31dbeff..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
@@ -1,21 +1,17 @@
package com.moral.api.controller;
import com.moral.api.pojo.dto.dataDisplay.MonitorPointDataDisplayDTO;
+import com.moral.api.pojo.dto.dataDisplay.SensorComparisonDisplayDTO;
import com.moral.api.pojo.form.dataDisplay.MonitorPointDataDisplayForm;
+import com.moral.api.pojo.form.dataDisplay.SensorComparisonDisplayForm;
import com.moral.api.service.DataDisplayService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
-import com.moral.util.DateUtils;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -36,67 +32,36 @@
@Autowired
DataDisplayService dataDisplayService;
- @GetMapping("monitorPointDataDisplay")
- public ResultMessage monitorPointDataDisplay(MonitorPointDataDisplayForm form){
+ @PostMapping("monitorPointDataDisplay")
+ public ResultMessage monitorPointDataDisplay( @RequestBody MonitorPointDataDisplayForm form){
+ //������������������������
+ 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());
+
+ List<MonitorPointDataDisplayDTO> dtos = dataDisplayService.getMonitorPointDisplayData(form);
+
+ return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),dtos);
+ }
+
+ @PostMapping("sensorComparisonDisplay")
+ public ResultMessage sensorComparisonDisplay(@RequestBody SensorComparisonDisplayForm form){
//������������������������
if (!form.valid())
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ List<SensorComparisonDisplayDTO> dtos = dataDisplayService.getSensorComparisonDisplayData(form);
+ return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),dtos);
+ }
- List<MonitorPointDataDisplayDTO> list = dataDisplayService.getMonitorPointDisplayData(form);
- /*MonitorPointDataDisplayDTO dto = new MonitorPointDataDisplayDTO();
- MonitorPointDataDisplayDTO dto1 = new MonitorPointDataDisplayDTO();
- MonitorPointDataDisplayDTO dto2 = new MonitorPointDataDisplayDTO();
-
- dto.setDeviceName("������������1");
- dto1.setDeviceName("������������2");
- dto2.setDeviceName("������������3");
-
- dto.setTime("yyyy-MM-dd HH:mm:ss");
- dto1.setTime("yyyy-MM-dd HH:mm:ss");
- dto2.setTime("yyyy-MM-dd HH:mm:ss");
-
- dto.setOrganizationName("������������1");
- dto1.setOrganizationName("������������2");
- dto2.setOrganizationName("������������3");
-
- dto.setA05024(1);
- dto1.setA05024(1);
- dto2.setA05024(1);
-
- dto.setA21005(1d);
- dto1.setA21005(1d);
- dto2.setA21005(1d);
-
- dto.setA21004(1);
- dto1.setA21004(1);
- dto2.setA21004(1);
-
- dto.setA21026(1);
- dto1.setA21026(1);
- dto2.setA21026(1);
-
- dto.setA34002(1);
- dto1.setA34002(1);
- dto2.setA34002(1);
-
- dto.setA34004(1);
- dto1.setA34004(1);
- dto2.setA34004(1);
-
- dto.setA99054(1d);
- dto1.setA99054(1d);
- dto2.setA99054(1d);
-
- dto.setAQI(1);
- dto1.setAQI(1);
- dto2.setAQI(1);
-
- List<MonitorPointDataDisplayDTO> list = new ArrayList<>();
- list.add(dto);
- list.add(dto1);
- list.add(dto2);*/
- return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),list);
+ @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