From 6450fec60b8dc7e6d31779bcfe3b23b3f665ebaf Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 28 Dec 2021 15:08:45 +0800
Subject: [PATCH] screen-api            更新单位转换代码

---
 screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java b/screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java
index 0f1da06..d10d3b1 100644
--- a/screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/HistoryHourlyController.java
@@ -52,4 +52,21 @@
         return ResultMessage.ok(resultMap);
     }
 
+    @RequestMapping(value = "getLastTwelveHourDataByOrgIdAndSensorCode", method = RequestMethod.GET)
+    @ResponseBody
+    public ResultMessage getLastTwelveHourDataByOrgIdAndSensorCode(HttpServletRequest request){
+        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request,null);
+        Object orgid = parameters.get("organization_id");
+        Object sensorCode = parameters.get("sensor_code");
+        if (ObjectUtils.isEmpty(orgid) || ObjectUtils.isEmpty(sensorCode)){
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+        }
+        Organization organization = organizationMapper.selectById(Integer.parseInt(orgid.toString()));
+        if (ObjectUtils.isEmpty(organization)){
+            return ResultMessage.fail(ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getCode(), ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getMsg());
+        }
+        Map<String, Object> resultMap = historyHourlyService.getLastTwelveHourDataByOrgIdAndSensorCode(parameters);
+        return ResultMessage.ok(resultMap);
+    }
+
 }

--
Gitblit v1.8.0