物联网实时数据查询-最大最小最新统计

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/AlarmDetectorController.java

@@ -1,9 +1,7 @@
 package com.usky.fire.controller.web;
 
 
-import com.alibaba.fastjson.JSONObject;
 import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.util.HttpUtils;
 import com.usky.common.influx.core.InfluxDbUtils;
 import com.usky.fire.service.AlarmDetectorService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,9 +10,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -43,8 +38,8 @@ public class AlarmDetectorController {
      * @return
      */
     @GetMapping("leftData")
-    public ApiResult<List<Map<String, Object>>> leftData(@RequestParam(value = "field") String field,
-                                                         @RequestParam(value = "deviceCode") String deviceCode) {
+    public ApiResult<Map<String, Object>> leftData(@RequestParam(value = "field") String field,
+                                                   @RequestParam(value = "deviceCode") String deviceCode) {
         return ApiResult.success(alarmDetectorService.leftData(field, deviceCode));
     }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/AlarmDetectorService.java

@@ -20,7 +20,7 @@ public interface AlarmDetectorService {
      * @param deviceCode 单位编号
      * @return
      */
-    List<Map<String, Object>> leftData(String field, String deviceCode);
+    Map<String, Object> leftData(String field, String deviceCode);
 
     /**
      * influxDB 最大、最小、最新数据查询

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/AlarmDetectorServiceImpl.java

@@ -29,15 +29,18 @@ public class AlarmDetectorServiceImpl implements AlarmDetectorService {
 
 
     @Override
-    public List<Map<String, Object>> leftData(String field, String deviceCode) {
+    public Map<String, Object> leftData(String field, String deviceCode) {
         Map<String, Object> maxMap = this.statusData(1, field, deviceCode);
         Map<String, Object> minMap = this.statusData(2, field, deviceCode);
         Map<String, Object> lastMap = this.statusData(3, field, deviceCode);
-        List<Map<String, Object>> list = new ArrayList<>();
-        list.add(maxMap);
-        list.add(minMap);
-        list.add(lastMap);
-        return list;
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("max", maxMap.get("max"));
+        map.put("maxTime", maxMap.get("time"));
+        map.put("min", minMap.get("min"));
+        map.put("minTime", minMap.get("time"));
+        map.put("last", lastMap.get("last"));
+        map.put("lastTime", lastMap.get("time"));
+        return map;
     }