From 2c86b47f500aa16ce7c142361fe4c3ffab45c1f6 Mon Sep 17 00:00:00 2001
From: chen_xi <276999030@qq.com>
Date: Thu, 27 Oct 2022 11:30:03 +0800
Subject: [PATCH] 监控站点数据、监测因子趋势、监测因子对比
---
screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
index 32d8773..3e8295e 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
@@ -74,7 +74,7 @@
orgIds.add(orgId);
QueryWrapper<SpecialDeviceHistory> queryWrapper = new QueryWrapper<>();
queryWrapper.select("mac", "name")
- .eq("special_type", Constants.SPECIAL_DEVICE_CRUISER)
+ //.eq("special_type", Constants.SPECIAL_DEVICE_CRUISER)
.eq("is_delete", Constants.NOT_DELETE)
.in("organization_id", orgIds);
return specialDeviceHistoryService.listMaps(queryWrapper);
@@ -107,11 +107,17 @@
o.putAll(value);
return false;
});
- for (Map<String, Object> map:data) {
+ /*for (Map<String, Object> map:data) {
Object third = map.get("dustld");
map.put("dustld",map.get("a21026"));
- map.put("a21026",String.valueOf(Double.parseDouble(third.toString())*100000));
- }
+ map.put("a21026",String.valueOf(Double.parseDouble(third.toString())*10000));
+ }*/
+ /*for (Map<String, Object> map : data) {
+ String a21026 = String.valueOf(map.get("a21026"));
+ String a21004 = String.valueOf(map.get("a21004"));
+ map.put("a21026",String.valueOf(Double.parseDouble(a21026) / 100));
+ map.put("a21004",String.valueOf(Double.parseDouble(a21004) / 10));
+ }*/
return filterData(data);
}
--
Gitblit v1.8.0