From f5dc2c1b244b4279410c6010f0da597e2a2e4ffa Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Wed, 24 Aug 2022 15:37:54 +0800
Subject: [PATCH] 尘负荷数据
---
screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 0a0e66c..64a13e0 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
@@ -3,11 +3,11 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.moral.api.entity.HistorySecondCruiser;
import com.moral.api.entity.Organization;
import com.moral.api.entity.SpecialDevice;
import com.moral.api.entity.SpecialDeviceHistory;
import com.moral.api.mapper.HistorySecondCruiserMapper;
-import com.moral.api.mapper.HistorySecondSpecialMapper;
import com.moral.api.mapper.SpecialDeviceMapper;
import com.moral.api.service.OrganizationService;
import com.moral.api.service.SpecialDeviceHistoryService;
@@ -43,7 +43,7 @@
public class SpecialDeviceServiceImpl extends ServiceImpl<SpecialDeviceMapper, SpecialDevice> implements SpecialDeviceService {
@Autowired
- private HistorySecondSpecialMapper historySecondSpecialMapper;
+ private HistorySecondCruiserMapper HistorySecondCruiserMapper;
@Autowired
private SpecialDeviceHistoryService specialDeviceHistoryService;
@@ -88,14 +88,14 @@
Integer orgId = (Integer) orgInfo.get("id");
params.put("orgId", orgId);
//������������������������������������
- List<Map<String, Object>> data = historySecondSpecialMapper.getSpecialDeviceData(params);
+ List<Map<String, Object>> data = HistorySecondCruiserMapper.getCruiserData(params);
if (ObjectUtils.isEmpty(data)) {
return data;
}
data.removeIf(o -> {
Map<String, Object> value = JSONObject.parseObject(o.remove("value").toString(), Map.class);
- Object flylon = value.get("flylon");
- Object flylat = value.get("flylat");
+ Object flylon = value.get(Constants.SENSOR_CODE_LON);
+ Object flylat = value.get(Constants.SENSOR_CODE_LAT);
if (ObjectUtils.isEmpty(flylon) || ObjectUtils.isEmpty(flylat)) {
return true;
}
@@ -107,6 +107,11 @@
o.putAll(value);
return false;
});
+ 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())*10000));
+ }
return filterData(data);
}
@@ -118,7 +123,6 @@
SpecialDevice specialDevice = specialDeviceMapper.selectOne(queryWrapper);
return specialDevice;
}
-
@Override
public List<String> getDatesByMac(String mac) {
--
Gitblit v1.8.0