From a0a6f95ec5b92be03385eea83b64bf97fcbfa17e Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 02 Nov 2023 17:08:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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 aeefda9..6f9dd2b 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,7 +1,10 @@
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;
@@ -36,10 +39,6 @@
import com.moral.api.entity.Dustld;
import com.moral.api.entity.ManageCoordinate;
import com.moral.api.entity.MaxRoad;
-import com.moral.api.mapper.DustldMapper;
-import com.moral.api.mapper.HistorySecondCruiserMapper;
-import com.moral.api.mapper.ManageCoordinateMapper;
-import com.moral.api.mapper.MaxRoadMapper;
import com.moral.api.pojo.dto.historySecondCruiser.DustldDTO;
import com.moral.api.pojo.dust.DustForm;
import com.moral.api.pojo.dust.TimeForm;
@@ -270,14 +269,21 @@
private ManageCoordinateMapper manageCoordinateMapper;
@Autowired
private MaxRoadMapper maxRoadMapper;
+ @Autowired
+ private OrganizationMapper organizationMapper;
@Override
@Transactional
- public Map<String, Object> dailyDustlds(List<MultipartFile> file,Map<String, Object> params) {
+ 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 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);
@@ -286,7 +292,10 @@
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<>();
//���������������������
@@ -388,7 +397,7 @@
}
}
}
- rsMap.put("data",builder);
+ rsMap.put("data",ObjectUtils.isEmpty(builder)?"������������������":builder);
rsMap.put("list3",list3);
rsMap.put("time",rsTime1+"-"+rsTime2);
rsMap.put("date1",dateString3.substring(5,10));
--
Gitblit v1.8.0