From 0eaefd62a7caa039a4f16e27be279eac5e84da5c Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 16 Oct 2023 08:50:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 107 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 77 insertions(+), 30 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 0562f3a..82c3eb2 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
@@ -4,23 +4,22 @@
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.entity.TbDaily;
+import com.moral.api.entity.*;
import com.moral.api.mapper.DailyMapper;
import com.moral.api.mapper.HistorySecondCruiserMapper;
import com.moral.api.mapper.SpecialDeviceMapper;
+import com.moral.api.mapper.SysDictTypeMapper;
import com.moral.api.pojo.bo.ExcelBO;
import com.moral.api.pojo.dto.historySecondCruiser.HistorySecondCruiserListDTO;
import com.moral.api.pojo.dto.historySecondCruiser.HistorySecondCruiserResultCountDTO;
import com.moral.api.pojo.dto.historySecondCruiser.HistorySecondCruiserResultDTO;
+import com.moral.api.pojo.enums.SysDictTypeEnum;
import com.moral.api.pojo.vo.excel.DailyVo;
import com.moral.api.service.OrganizationService;
import com.moral.api.service.SpecialDeviceHistoryService;
import com.moral.api.service.SpecialDeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.service.SysDictTypeService;
import com.moral.constant.Constants;
import com.moral.util.AmendUtils;
@@ -59,6 +58,9 @@
@Autowired
private HistorySecondCruiserMapper HistorySecondCruiserMapper;
+
+ @Autowired
+ private SysDictTypeService sysDictTypeService;
@Autowired
private SpecialDeviceHistoryService specialDeviceHistoryService;
@@ -128,12 +130,7 @@
if (lon < 70 || lon > 150 || lat < 20 || lat > 60) {
return true;
}
- if(type){
- o.putAll(value);
- }else {
-
- }
-
+ o.putAll(value);
return false;
});
/*for (Map<String, Object> map:data) {
@@ -153,12 +150,13 @@
@Override
public List<HistorySecondCruiserResultDTO> carTrajectoryNewAvg(Map<String, Object> params) {
double range = Double.valueOf(params.get("range").toString());
+ String type = params.get("type").toString();
params.put("dateFormat", "%Y-%m-%d %H:%i:%s");
Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
Integer orgId = (Integer) orgInfo.get("id");
params.put("orgId", orgId);
- params.put("type","$."+params.get("type"));
+ params.put("type","$."+type);
//������������������������������������
List<HistorySecondCruiserListDTO> data = HistorySecondCruiserMapper.getCruiserDataNewAvg(params);
data.removeIf(o->{
@@ -175,8 +173,39 @@
if(CollectionUtils.isEmpty(data)){
return null;
}
- return filterDataNew(data,range);
+ List<HistorySecondCruiserResultDTO> result = filterDataNew(data,range);
+ if(CollectionUtils.isNotEmpty(result)){
+ SysDictData list = sysDictTypeService.listOne(SysDictTypeEnum.SYS_SECOND_CRUISER.getValue(),type);
+ if(list.getDataValue().contains(",")){
+ List<String> resultStr = Arrays.asList(list.getDataValue().split(","));
+ if(resultStr.size() % 2 ==0){
+ result.forEach(it->{
+ it.setAvgNum(numAvg(resultStr,it.getAvgNum()));
+ });
+ }
+ }else {
+ BigDecimal dataValue = Objects.nonNull(list.getDataValue())?BigDecimal.valueOf(Integer.parseInt(list.getDataValue())):BigDecimal.ZERO;
+ result.forEach(it->{
+ it.setAvgNum(it.getAvgNum().add(dataValue));
+ });
+ }
+
+
+ }
+ return result;
}
+
+ private BigDecimal numAvg(List<String> list , BigDecimal num){
+ int nums = 1;
+ for (int i=0;i<list.size();i=i+2){
+ if(num.compareTo(BigDecimal.valueOf(Integer.parseInt(list.get(i))))>= 0 ){
+ return num.add(BigDecimal.valueOf(Integer.parseInt(list.get(nums))));
+ }
+ nums+=2;
+ }
+ return num;
+ }
+
@Override
public SpecialDevice getSpecialDeviceMapByMac(String mac) {
QueryWrapper<SpecialDevice> queryWrapper = new QueryWrapper();
@@ -216,7 +245,10 @@
String time2 = params.get("time2").toString();
String rsTime = getTime(time1, time2);
list.add(rsTime);
- List<Map<String, Object>> maps = specialDeviceService.carTrajectory(params,false);
+// List<Map<String, Object>> maps = specialDeviceService.carTrajectory(params,false);
+// List<Map<String, Object>> maps = HistorySecondCruiserMapper.getCruiserData(params);
+ List<Map<String, Object>> maps = HistorySecondCruiserMapper.getAllCruiserData(params);
+
if (ObjectUtils.isEmpty(maps)){
return null;
}
@@ -228,7 +260,8 @@
map.put("time1",time3);
map.put("time2",time4);
map.put("mac",mac);
- List<Map<String, Object>> maps1 = specialDeviceService.carTrajectory(map,false);
+// List<Map<String, Object>> maps1 = specialDeviceService.carTrajectory(map,false);
+ List<Map<String, Object>> maps1 = HistorySecondCruiserMapper.getAllCruiserData(params);
if (ObjectUtils.isEmpty(maps1)){
return null;
}
@@ -244,7 +277,8 @@
map.put("time1",time5);
map.put("time2",time6);
map.put("mac",mac);
- List<Map<String, Object>> maps1 = specialDeviceService.carTrajectory(map,false);
+// List<Map<String, Object>> maps1 = specialDeviceService.carTrajectory(map,false);
+ List<Map<String, Object>> maps1 = HistorySecondCruiserMapper.getAllCruiserData(params);
if (ObjectUtils.isEmpty(maps1)){
return null;
}
@@ -464,20 +498,28 @@
for (Map<String, Object> map : maps) {
-// String flylon = map.get("flylon").toString();
-// String flylat = map.get("flylat").toString();
-// String s = flylon + "-" + flylat;
-// if (Double.parseDouble(map.get("a34004").toString())>200){
-//
-// }
- pm25List.add(Double.parseDouble(map.get("a34004").toString()));
- pm10List.add(Double.parseDouble(map.get("a34002").toString()));
- COList.add(Double.parseDouble(map.get("a21005").toString()));
- SO2List.add(Double.parseDouble(map.get("a21026").toString()));
- NO2List.add(Double.parseDouble(map.get("a21004").toString()));
- O3List.add(Double.parseDouble(map.get("a05024").toString()));
- VOCList.add(Double.parseDouble(map.get("a99054").toString()));
-
+ Map value = JSON.parseObject(map.get("value").toString(), Map.class);
+ if (!ObjectUtils.isEmpty(value.get("a34004"))){
+ pm25List.add(Double.parseDouble(value.get("a34004").toString()));
+ }
+ if (!ObjectUtils.isEmpty(value.get("a34002"))){
+ pm10List.add(Double.parseDouble(value.get("a34002").toString()));
+ }
+ if (!ObjectUtils.isEmpty(value.get("a21005"))){
+ COList.add(Double.parseDouble(value.get("a21005").toString()));
+ }
+ if (!ObjectUtils.isEmpty(value.get("a21026"))){
+ SO2List.add(Double.parseDouble(value.get("a21026").toString()));
+ }
+ if (!ObjectUtils.isEmpty(value.get("a21004"))){
+ NO2List.add(Double.parseDouble(value.get("a21004").toString()));
+ }
+ if (!ObjectUtils.isEmpty(value.get("a05024"))){
+ O3List.add(Double.parseDouble(value.get("a05024").toString()));
+ }
+ if (!ObjectUtils.isEmpty(value.get("a99054"))){
+ VOCList.add(Double.parseDouble(value.get("a99054").toString()));
+ }
}
//���������������
@@ -590,6 +632,11 @@
if(!list.contains(d)){
list.add(d);
integer++;
+ HistorySecondCruiserResultCountDTO countResultDTO = Objects.isNull(map.get(integer))?new HistorySecondCruiserResultCountDTO():map.get(integer);
+ countResultDTO.setSumNum(d.getNum());
+ countResultDTO.setContNum(1);
+ map.put(integer,countResultDTO);
+ mapTest.put(d.getFlyLon()+"_"+d.getFlyLat(),d.getNum());
}
}
}
--
Gitblit v1.8.0