From 4107073950f459e051e5b9e828750ab57be3863b Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 15 Nov 2023 16:03:53 +0800
Subject: [PATCH] fix：补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 164 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 126 insertions(+), 38 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 b232159..2930b9a 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,25 @@
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.config.Interceptor.UserHelper;
+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.device.AppDeviceVo;
import com.moral.api.pojo.vo.excel.DailyVo;
+import com.moral.api.pojo.vo.user.QxUser;
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;
@@ -61,6 +63,9 @@
private HistorySecondCruiserMapper HistorySecondCruiserMapper;
@Autowired
+ private SysDictTypeService sysDictTypeService;
+
+ @Autowired
private SpecialDeviceHistoryService specialDeviceHistoryService;
@Autowired
@@ -91,16 +96,28 @@
//������������������������
Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
+ Integer userId = (Integer) userInfo.get("userId");
+ List<Integer> integerList = new ArrayList<>();
+ SysDictData listSys = sysDictTypeService.listOne(SysDictTypeEnum.SYS_SECOND_CRUISER_RANGE.getValue(),userId.toString());
+ if(listSys.getDataValue().contains(",")){
+ List<Integer> resultStr = Arrays.asList(listSys.getDataValue().split(",")).stream().map(Integer::parseInt).collect(Collectors.toList());
+ integerList.addAll(resultStr);
+ }else {
+ Integer dataValue = Objects.nonNull(listSys.getDataValue())?Integer.parseInt(listSys.getDataValue()):0;
+ integerList.add(dataValue);
+ }
Integer orgId = (Integer) orgInfo.get("id");
//���������������������
List<Organization> organizations = organizationService.getChildrenOrganizationsById(orgId);
List<Integer> orgIds = organizations.stream().map(Organization::getId).collect(Collectors.toList());
orgIds.add(orgId);
+ integerList.addAll(orgIds);
QueryWrapper<SpecialDeviceHistory> queryWrapper = new QueryWrapper<>();
- queryWrapper.select("mac", "name")
+ queryWrapper.select("DISTINCT mac, name").lambda();
+
//.eq("special_type", Constants.SPECIAL_DEVICE_CRUISER)
- .eq("is_delete", Constants.NOT_DELETE)
- .in("organization_id", orgIds);
+ queryWrapper.eq("is_delete", Constants.NOT_DELETE)
+ .in("organization_id", integerList);
return specialDeviceHistoryService.listMaps(queryWrapper);
}
@@ -128,12 +145,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) {
@@ -152,12 +164,25 @@
@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();
+ Integer userId = (Integer) userInfo.get("userId");
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"));
+ List<Integer> integerList = new ArrayList<>();
+ SysDictData listSys = sysDictTypeService.listOne(SysDictTypeEnum.SYS_SECOND_CRUISER_RANGE.getValue(),userId.toString());
+ if(listSys.getDataValue().contains(",")){
+ List<Integer> resultStr = Arrays.asList(listSys.getDataValue().split(",")).stream().map(Integer::parseInt).collect(Collectors.toList());
+ integerList.addAll(resultStr);
+ }else {
+ Integer dataValue = Objects.nonNull(listSys.getDataValue())?Integer.parseInt(listSys.getDataValue()):0;
+ integerList.add(dataValue);
+ }
+ integerList.add(orgId);
+ params.put("orgIds", integerList);
+ params.put("type","$."+type);
//������������������������������������
List<HistorySecondCruiserListDTO> data = HistorySecondCruiserMapper.getCruiserDataNewAvg(params);
data.removeIf(o->{
@@ -174,8 +199,39 @@
if(CollectionUtils.isEmpty(data)){
return null;
}
- return filterDataNew(data);
+ 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(Double.parseDouble(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(Double.parseDouble(list.get(i))))>= 0 ){
+ return num.add(BigDecimal.valueOf(Double.parseDouble(list.get(i+1))));
+ }
+ nums+=2;
+ }
+ return num;
+ }
+
@Override
public SpecialDevice getSpecialDeviceMapByMac(String mac) {
QueryWrapper<SpecialDevice> queryWrapper = new QueryWrapper();
@@ -215,7 +271,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;
}
@@ -227,7 +286,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;
}
@@ -243,7 +303,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;
}
@@ -449,6 +510,20 @@
return excelBOS;
}
+ @Override
+ public List<AppDeviceVo> selectSpecialDevice() {
+ QxUser user = UserHelper.getCurrentUser();
+ Integer organizationId = user.getOrganizationId();
+// Integer organizationId=71;
+ List<AppDeviceVo> appDeviceVos;
+ if (organizationId!=24){
+ appDeviceVos = specialDeviceMapper.selectSpecialDevice(organizationId);
+ }else {
+ appDeviceVos = specialDeviceMapper.selectSpecialDevice(null);
+ }
+ return appDeviceVos;
+ }
+
//���������������������������
private HashMap<String, Object> getStringObjectHashMap(List<Map<String, Object>> maps) {
HashMap<String, Object> rsMap = new HashMap<>();
@@ -463,20 +538,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()));
+ }
}
//���������������
@@ -557,7 +640,7 @@
return list;
}
//������������������������
- private List<HistorySecondCruiserResultDTO> filterDataNew(List<HistorySecondCruiserListDTO> data) {
+ private List<HistorySecondCruiserResultDTO> filterDataNew(List<HistorySecondCruiserListDTO> data,double range) {
List<HistorySecondCruiserListDTO> list = new ArrayList<>();
Map<Integer, HistorySecondCruiserResultCountDTO> map = new HashMap<>();
Map<String, BigDecimal> mapTest = new HashMap<>();
@@ -573,7 +656,7 @@
boolean flag = true;
for (HistorySecondCruiserListDTO l : list) {
double distance = GeodesyUtils.getDistance(d.getFlyLat(), d.getFlyLon(), l.getFlyLat(), l.getFlyLon());
- if (distance < DIS_NEW) {
+ if (distance < range) {
flag = false;
if(integer.equals(list.size())&& !mapTest.containsKey(d.getFlyLon()+"_"+d.getFlyLat())){
HistorySecondCruiserResultCountDTO countResultDTO = Objects.isNull(map.get(integer))?new HistorySecondCruiserResultCountDTO():map.get(integer);
@@ -589,6 +672,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());
}
}
}
@@ -621,7 +709,7 @@
}
- private List<HistorySecondCruiserResultDTO> filterDataNew(List<HistorySecondCruiserListDTO> data, List<HistorySecondCruiserListDTO> list) {
+ private List<HistorySecondCruiserResultDTO> filterDataNew(List<HistorySecondCruiserListDTO> data, List<HistorySecondCruiserListDTO> list,double range) {
List<HistorySecondCruiserResultDTO> listResult = new ArrayList<>();
List<HistorySecondCruiserListDTO> filter = new ArrayList<>();
for (HistorySecondCruiserListDTO d : data) {
@@ -630,7 +718,7 @@
if (filter.contains(d)) {
break;
}
- if (distance < DIS_NEW ) {
+ if (distance < range ) {
List<BigDecimal> numList = new ArrayList<>(CollectionUtils.isEmpty(l.getNumList()) ? Arrays.asList(l.getNum()) : l.getNumList());
numList.add(d.getNum());
l.setNumList(numList);
--
Gitblit v1.8.0