From e4ebf74baef4faab3fa794c042e2921437525e6e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 12 Aug 2021 10:40:52 +0800
Subject: [PATCH] update
---
screen-api/src/main/java/com/moral/api/controller/WebController.java | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 112 insertions(+), 4 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/WebController.java b/screen-api/src/main/java/com/moral/api/controller/WebController.java
index ae6bf47..7562116 100644
--- a/screen-api/src/main/java/com/moral/api/controller/WebController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/WebController.java
@@ -7,19 +7,31 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
+import com.moral.api.service.DeviceService;
import com.moral.api.service.HistoryDailyService;
+import com.moral.api.service.HistoryFiveMinutelyService;
import com.moral.api.service.HistoryHourlyService;
+import com.moral.api.service.SysAreaService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.moral.util.WebUtils;
+/**
+ * web���������
+ *
+ * @author moral
+ * @version v1.0
+ */
@Slf4j
@Api(tags = {"web���������"})
@RestController
@@ -32,6 +44,19 @@
@Autowired
private HistoryDailyService historyDailyService;
+ @Autowired
+ private HistoryFiveMinutelyService historyFiveMinutelyService;
+
+ @Autowired
+ private DeviceService deviceService;
+
+ @Autowired
+ private SysAreaService sysAreaService;
+
+ /**
+ * @param request ������������
+ * @return ������������������������������������
+ */
@GetMapping("getHourlyAqi")
@ApiOperation(value = "���������������AQI", notes = "���������������AQI")
@ApiImplicitParams(value = {
@@ -43,10 +68,14 @@
if (!params.containsKey("mac")) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
- Map<String, Object> result = historyHourlyService.getHourlyAqiByMac(params.get("mac").toString());
- return ResultMessage.ok(result);
+ Map<String, Object> response = historyHourlyService.getHourlyAqiByMac(params.get("mac").toString());
+ return ResultMessage.ok(response);
}
+ /**
+ * @param request ������������
+ * @return ������������������������������������
+ */
@GetMapping("getMonthAvg")
@ApiOperation(value = "������������������������������������", notes = "������������������������������������")
@ApiImplicitParams(value = {
@@ -59,8 +88,87 @@
if (!params.containsKey("mac") || !params.containsKey("sensorCode")) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
- Map<String, Object> result = historyDailyService.getMonthAvg(params);
- return ResultMessage.ok(result);
+ Map<String, Object> response = historyDailyService.getMonthAvg(params);
+ return ResultMessage.ok(response);
+ }
+
+ /**
+ * @param request ������������
+ * @return ������������������������������������
+ */
+ @GetMapping("getWindData")
+ @ApiOperation(value = "������������������", notes = "������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
+ @ApiImplicitParam(name = "monitorPointIds", value = "������id", required = true, paramType = "query", dataType = "String")
+ })
+ public ResultMessage getWindData(HttpServletRequest request) {
+ Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
+ if (!params.containsKey("monitorPointIds")) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ String[] monitorPointIds = params.remove("monitorPointIds").toString().split(",");
+ params.put("monitorPointIds", monitorPointIds);
+ List<Object> response = historyFiveMinutelyService.getAreaWindData(params);
+ return ResultMessage.ok(response);
+ }
+
+ /**
+ * @param params ������������
+ * @return ������������������������������������
+ */
+ @PostMapping("getMacSensors")
+ @ApiOperation(value = "������������mac������������������", notes = "������������mac������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
+ @ApiImplicitParam(name = "macs", value = "������mac���������������������", required = true, paramType = "query", dataType = "List")
+ })
+ public ResultMessage getMacSensors(@RequestBody Map<String,Object> params) {
+ if (!params.containsKey("macs")) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ Map<String, Object> response = deviceService.getSensorsByMac(params);
+ return ResultMessage.ok(response);
+ }
+
+ /**
+ * @param params ������������
+ * @return ������������������������������������
+ */
+ @PostMapping("getTrendChartData")
+ @ApiOperation(value = "���������������������������������", notes = "���������������������������������.")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
+ @ApiImplicitParam(name = "macs", value = "������mac���������������������", required = true, paramType = "body", dataType = "list"),
+ @ApiImplicitParam(name = "sensorCode", value = "������code", required = true, paramType = "body", dataType = "String"),
+ @ApiImplicitParam(name = "type", value = "���������������������day���,������month���,������year���", required = true, paramType = "body", dataType = "String"),
+ @ApiImplicitParam(name = "times", value = "���������������������2021-07-29������������2021-07������������2021������������������������", required = true, paramType = "body", dataType = "List")
+ })
+ public ResultMessage getTrendChartData(@RequestBody Map<String,Object> params) {
+ if (!params.containsKey("macs") || !params.containsKey("sensorCode") || !params.containsKey("type") || !params.containsKey("times")) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ List<Map<String, Object>> response = deviceService.getTrendChartData(params);
+ return ResultMessage.ok(response);
+ }
+
+ /**
+ * @param request ������������
+ * @return ������������������������������������
+ */
+ @GetMapping("getMapPath")
+ @ApiOperation(value = "������������������������������", notes = "������������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
+ @ApiImplicitParam(name = "organizationId", value = "������id", required = true, paramType = "query", dataType = "String")
+ })
+ public ResultMessage getMapPath(HttpServletRequest request) {
+ Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
+ if (!params.containsKey("organizationId")) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ List<Map<String, Object>> response = sysAreaService.getMapPath(Integer.parseInt(params.get("organizationId").toString()));
+ return ResultMessage.ok(response);
}
}
--
Gitblit v1.8.0