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/DustldServiceImpl.java | 156 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 108 insertions(+), 48 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java
index ec8164a..4ce7314 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java
@@ -1,10 +1,14 @@
package com.moral.api.service.impl;
+import com.moral.api.exception.BusinessException;
+import com.moral.api.mapper.*;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.system.ApplicationHome;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.web.multipart.MultipartFile;
@@ -34,9 +38,7 @@
import com.moral.api.entity.Dustld;
import com.moral.api.entity.ManageCoordinate;
-import com.moral.api.mapper.DustldMapper;
-import com.moral.api.mapper.HistorySecondCruiserMapper;
-import com.moral.api.mapper.ManageCoordinateMapper;
+import com.moral.api.entity.MaxRoad;
import com.moral.api.pojo.dto.historySecondCruiser.DustldDTO;
import com.moral.api.pojo.dust.DustForm;
import com.moral.api.pojo.dust.TimeForm;
@@ -87,29 +89,25 @@
for (TimeForm timeForm : tables) {
String start = timeForm.getStart();
String end = timeForm.getEnd();
- List<Double> dust = historySecondCruiserMapper.getDust(start, end, mac);
+ List<String> dust = historySecondCruiserMapper.getDust(start, end, mac);
ArrayList<Double> rsDouble = new ArrayList<>();
- for (Double aDouble : dust) {
- double v =0.0;
+ for (String s : dust) {
+ double aDouble = Double.parseDouble(s);
+
if (aDouble>=0 && aDouble<40 ){
- v = aDouble + 170;
+ aDouble = aDouble + 170;
+ }else if (aDouble>=40 && aDouble<60){
+ aDouble = aDouble + 130;
+ }else if (aDouble>=60 && aDouble<100 ){
+ aDouble = aDouble + 110;
+ }else if (aDouble>=100 && aDouble<150){
+ aDouble = aDouble + 70;
+ }else if (aDouble>=150 && aDouble<180){
+ aDouble = aDouble + 30;
+ }else {
+ aDouble= aDouble+0;
}
- if (aDouble>=40 && aDouble<60 ){
- v = aDouble + 130;
- }
- if (aDouble>=60 && aDouble<100 ){
- v = aDouble + 110;
- }
- if (aDouble>=100 && aDouble<150 ){
- v = aDouble + 70;
- }
- if (aDouble>=150 && aDouble<180 ){
- v = aDouble + 30;
- }
- if (aDouble>=180){
- v= aDouble;
- }
- rsDouble.add(v);
+ rsDouble.add(aDouble);
}
list.addAll(rsDouble);
}
@@ -269,25 +267,42 @@
@Autowired
private ManageCoordinateMapper manageCoordinateMapper;
+ @Autowired
+ private MaxRoadMapper maxRoadMapper;
+ @Autowired
+ private OrganizationMapper organizationMapper;
@Override
- public Map<String, Object> dailyDustlds(List<MultipartFile> file,Map<String, Object> params) {
+ @Transactional
+ public Map<String, Object> dailyDustlds(Map<String, Object> params) {
+
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");
- String time1 = params.get("time1").toString();
- String substring1 = time1.substring(5, 14);
- String time2 = params.get("time2").toString();
- String substring2 = time2.substring(5, 14);
+ String mac = params.get("mac").toString();
+ List<Integer> orgList = organizationMapper.orgIdSpecialDevList(orgId,mac);
+ if(CollectionUtils.isEmpty(orgList)){
+ throw new BusinessException("������������������������������������");
+ }
+ String time1 = params.get("startTime").toString();
+ String dateString1 = DateUtils.stringToDateString(time1, DateUtils.yyyy_MM_dd_HH_mm_ss_EN, DateUtils.yyyy_MM_dd_HH_mm_CN);
+ String rsTime1 = dateString1.substring(5, 14);
+ String time2 = params.get("endTime").toString();
+ String dateString2 = DateUtils.stringToDateString(time2, DateUtils.yyyy_MM_dd_HH_mm_ss_EN, DateUtils.yyyy_MM_dd_HH_mm_CN);
+ String rsTime2 = dateString2.substring(5, 14);
HashMap<String, Object> rsMap = new HashMap<>();
List<Map<String, Object>> dusts = historySecondCruiserMapper.getDusts(params);
- Map<String, List<DustldDTO>> collect = manageCoordinateMapper.CompareTo(orgId).stream().collect(Collectors.groupingBy(o -> o.getName()));
+ Map<String, List<DustldDTO>> collect = manageCoordinateMapper.CompareTo(orgList.get(0)).stream().collect(Collectors.groupingBy(o -> o.getName()));
+ if (ObjectUtils.isEmpty(dusts) || ObjectUtils.isEmpty(collect)){
+ return null;
+ }
Set<String> strings = collect.keySet();
ArrayList<DustForm> list1 = new ArrayList<>();
- ArrayList<DustForm> list2 = new ArrayList<>();
+ //���������������������
StringBuilder builder = new StringBuilder();
int i = 1;
+ long timestamp = System.currentTimeMillis();
for (String string : strings) {
DustForm dustForm = new DustForm();
ArrayList<Double> doubleArrayList = new ArrayList<>();
@@ -295,26 +310,29 @@
for (DustldDTO dustldDTO : dustldDTOS) {
String flyLat = dustldDTO.getFlyLat();
String flyLon = dustldDTO.getFlyLon();
+ if (flyLon==null && flyLat==null){
+ continue;
+ }
+ double latDouble1 = Double.parseDouble(flyLat);
+ double lonDouble1 = Double.parseDouble(flyLon);
for (Map<String, Object> dust : dusts) {
String flyLat1 = Objects.nonNull(dust.get("flyLat")) ? dust.get("flyLat").toString() :"0";
String flyLon1 = Objects.nonNull(dust.get("flyLon")) ? dust.get("flyLon").toString() :"0";
+ double latDouble = Double.parseDouble(flyLat1);
+ double lonDouble = Double.parseDouble(flyLon1);
// String flyLon1 = dust.get("flyLon").toString();
- if (flyLat1.equals(flyLat) && flyLon1.equals(flyLon)){
+ if (latDouble1==latDouble && lonDouble1==lonDouble){
Double dustld = Objects.nonNull(dust.get("dustld"))?Double.parseDouble(dust.get("dustld").toString()):0d;
if (dustld>=0 && dustld<40 ){
dustld = dustld + 170;
- }
- if (dustld>=40 && dustld<60 ){
+ }else if (dustld>=40 && dustld<60){
dustld = dustld + 130;
- }
- if (dustld>=60 && dustld<100 ){
+ }else if (dustld>=60 && dustld<100 ){
dustld = dustld + 110;
- }
- if (dustld>=100 && dustld<150 ){
+ }else if (dustld>=100 && dustld<150){
dustld = dustld + 70;
- }
- if (dustld>=150 && dustld<180 ){
+ }else if (dustld>=150 && dustld<180){
dustld = dustld + 30;
}
doubleArrayList.add(dustld);
@@ -322,26 +340,68 @@
}
}
}
+ if (ObjectUtils.isEmpty(doubleArrayList)){
+ continue;
+ }
Double ListAva = doubleArrayList.stream() .collect(Collectors.averagingDouble(Double::doubleValue));
double rsAvg = new BigDecimal(ListAva/1000).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
dustForm.setRoad(string);
dustForm.setValue(rsAvg);
+ list1.add(dustForm);
if (rsAvg>=0.3){
builder.append("("+i+")"+string);
-
- list1.add(dustForm);
- }else {
- list2.add(dustForm);
+ i++;
+ //������������������
+ QueryWrapper<MaxRoad> wrapper = new QueryWrapper<>();
+ wrapper.eq("name",string);
+ wrapper.eq("time",DateUtils.getDate(time1,DateUtils.yyyy_MM_dd_EN));
+ Integer integer = maxRoadMapper.selectCount(wrapper);
+ if (integer==0){
+ MaxRoad maxRoad = new MaxRoad();
+ maxRoad.setData(rsAvg);
+ maxRoad.setName(string);
+ maxRoad.setTime(DateUtils.getDate(time1,DateUtils.yyyy_MM_dd_EN));
+ maxRoadMapper.insert(maxRoad);
+ }
}
}
+ long timestamp2 = System.currentTimeMillis();
+ log.info(timestamp2-timestamp+"");
//������
list1.sort(Comparator.comparing(DustForm::getValue).reversed());
- list2.sort(Comparator.comparing(DustForm::getValue).reversed());
rsMap.put("list1",list1);
- rsMap.put("list2",list2);
- rsMap.put("data",builder);
- rsMap.put("list3","");
- rsMap.put("time",substring1+"-"+substring2);
+
+
+ //������������������������������
+ ArrayList<Map<String, Object>> list3 = new ArrayList<>();
+ QueryWrapper<MaxRoad> wrapper = new QueryWrapper<>();
+ wrapper.lt("time",DateUtils.getDate(time1,DateUtils.yyyy_MM_dd_EN));
+ wrapper.orderByDesc("time");
+
+ List<MaxRoad> maxRoads = maxRoadMapper.selectList(wrapper);
+ String dateString3 = DateUtils.dateToDateString(maxRoads.get(0).getTime(), DateUtils.yyyy_MM_dd_CN);
+ QueryWrapper<MaxRoad> wrapper2 = new QueryWrapper<>();
+ wrapper2.eq("time",maxRoads.get(0).getTime());
+ List<MaxRoad> maxRoads1 = maxRoadMapper.selectList(wrapper2);
+
+ //������������������������������
+ for (MaxRoad road : maxRoads1) {
+ for (DustForm dustForm : list1) {
+ if (road.getName().equals(dustForm.getRoad())){
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("road",road.getName());
+ map.put("value1",String.format("%.2f",road.getData()));
+ map.put("value2",String.format("%.2f",dustForm.getValue()));
+ map.put("value3",String.format("%.2f",road.getData()-dustForm.getValue()));
+ list3.add(map);
+ }
+ }
+ }
+ rsMap.put("data",ObjectUtils.isEmpty(builder)?"������������������":builder);
+ rsMap.put("list3",list3);
+ rsMap.put("time",rsTime1+"-"+rsTime2);
+ rsMap.put("date1",dateString3.substring(5,10));
+ rsMap.put("date2",dateString1.substring(5,10));
return rsMap;
}
--
Gitblit v1.8.0