From 0aea8bd18daaaf91e622fdcfdd81dbb2e1b4860c Mon Sep 17 00:00:00 2001
From: swb <jpy123456>
Date: Mon, 21 Oct 2024 09:01:18 +0800
Subject: [PATCH] fix:立行立改责任主体修改提交
---
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 225 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 167 insertions(+), 58 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 19ce094..a129ae8 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -4,45 +4,33 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.config.Interceptor.UserHelper;
-import com.moral.api.config.mybatis.MybatisPlusConfig;
import com.moral.api.dto.OnlineRatePageCond;
import com.moral.api.entity.*;
import com.moral.api.mapper.DeviceMapper;
import com.moral.api.mapper.HistoryFiveMinutelyMapper;
import com.moral.api.mapper.HistoryHourlyMapper;
import com.moral.api.mapper.OrganizationUnitAlarmMapper;
-import com.moral.api.mapper.UnitConversionMapper;
import com.moral.api.pojo.dust.OnlineRateLogsForm;
import com.moral.api.pojo.vo.device.AppDeviceVo;
import com.moral.api.pojo.vo.user.QxUser;
import com.moral.api.service.DeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.service.HistoryDailyService;
-import com.moral.api.service.HistoryFiveMinutelyService;
import com.moral.api.service.HistoryHourlyService;
-import com.moral.api.service.HistoryMonthlyService;
import com.moral.api.service.SensorService;
import com.moral.api.service.UnitConversionService;
+import com.moral.api.utils.StringUtils;
import com.moral.api.vo.OnlineRateVo;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.constant.SeparateTableType;
import com.moral.util.DateUtils;
-
import com.moral.util.MybatisPLUSUtils;
-import com.sun.org.apache.regexp.internal.RE;
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.kafka.streams.state.internals.metrics.Sensors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
-
-import java.text.DecimalFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -68,6 +56,8 @@
@Autowired
SensorService sensorService;
+ @Autowired
+ private DeviceService deviceService;
@Autowired
UnitConversionService unitConversionService;
@@ -119,9 +109,18 @@
);
//������mac
- List<String> macs = (List<String>) params.remove("macs");
+ List<String> macList = (List<String>) params.remove("macs");
List<Map<String, Object>> elementLists = new ArrayList<>();
-
+ List<String> idList = macList.stream().filter(it->it.contains(",avg")).collect(Collectors.toList());
+ List<String> idListExcluding = macList.stream().filter(it->!it.contains(",avg")).collect(Collectors.toList());
+ List<String> macs = new ArrayList<>();
+ for(String s : idList){
+ String mm = s.substring(0, s.indexOf(",avg"));
+ List<String> macResultList = deviceService.getMacMonitorPointId(Integer.parseInt(mm));
+ macs.addAll(macResultList);
+ }
+ macs.addAll(idListExcluding);
+ macs = macs.stream().distinct().collect(Collectors.toList());
for (String mac : macs) {
//���redis���������������������������
Device device = (Device) redisTemplate.opsForHash().get(RedisConstants.DEVICE_INFO, mac);
@@ -363,7 +362,7 @@
Date startDate = DateUtils.getDate(startTime,DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
Date endDate = DateUtils.getDate(endTime,DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
List<String> tableNames = MybatisPLUSUtils.getTableNamesByWrapper(startDate, endDate, SeparateTableType.MONTH);
- for (String mac:macs) {
+/* for (String mac:macs) {
Map<String, Object> mapParams = new HashMap<>();
mapParams.put("startDate",startDate);
mapParams.put("endDate",endDate);
@@ -397,6 +396,56 @@
historyHourlyMap.put("time",timeStr);
list.add(historyHourlyMap);
}
+ }*/
+
+
+ for (String mac:macs) {
+ Map<String, Object> mapParams = new HashMap<>();
+ mapParams.put("startDate",startDate);
+ mapParams.put("endDate",endDate);
+ mapParams.put("mac",mac);
+ List<HistoryFiveMinutely> HistoryFiveMinutelys = FiveMinuteTableQuery(mapParams, tableNames);
+ HistoryFiveMinutelys = HistoryFiveMinutelys.stream().distinct().collect(Collectors.toList());
+ List<HistoryFiveMinutely> distinctHistoryHourlies = new ArrayList<>();
+ Map<String, Object> disMap = new HashMap<>();
+ for (HistoryFiveMinutely historyFiveMinutely:HistoryFiveMinutelys) {
+ Date time = historyFiveMinutely.getTime();
+ String timeStr = DateUtils.dateToDateString(time,DateUtils.yyyy_MM_dd_HH_mm_EN);
+ if (!disMap.containsKey(timeStr)){
+ distinctHistoryHourlies.add(historyFiveMinutely);
+ disMap.put(timeStr,true);
+ }
+ }
+ for (HistoryFiveMinutely historyFiveMinutely:distinctHistoryHourlies) {
+ Map<String,Object> historyHourlyMap = new HashMap<>();
+ historyHourlyMap.put("mac",mac);
+ JSONObject value= JSONObject.parseObject(historyFiveMinutely.getValue());
+ Double sensorValue = Objects.nonNull(value)&&Objects.nonNull(value.get(sensorCode))?Double.parseDouble(value.get(sensorCode).toString()):0d;
+ historyHourlyMap.put(sensorCode,sensorValue);
+ Date time = historyFiveMinutely.getTime();
+ String timeStr = DateUtils.dateToDateString(time, DateUtils.yyyy_MM_dd_HH_mm_EN);
+ historyHourlyMap.put("time",timeStr);
+ list.add(historyHourlyMap);
+ }
+ }
+ Date middleDate = DateUtils.getDate(startTime,DateUtils.yyyy_MM_dd_HH_mm_EN);
+ while (DateUtils.compareDateStr(endTime,DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_HH_mm_EN),DateUtils.yyyy_MM_dd_HH_mm_EN)<=0){
+ for (String mac:macs) {
+ boolean flag = true;
+ for (Map map:list) {
+ if (map.get("time").equals(DateUtils.dateToDateString(middleDate, DateUtils.yyyy_MM_dd_HH_mm_EN)) && map.get("mac").toString().equals(mac.toString())){
+ flag = false;
+ }
+ }
+ if (flag){
+ Map<String,Object> historyHourlyMap = new HashMap<>();
+ historyHourlyMap.put("mac",mac);
+ historyHourlyMap.put(sensorCode,"0.0");
+ historyHourlyMap.put("time",DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_HH_mm_EN));
+ list.add(historyHourlyMap);
+ }
+ }
+ middleDate = DateUtils.getDateOfMin(middleDate,5);
}
}
for (Map map:list) {
@@ -501,6 +550,15 @@
}
@Override
+ public List getMacMonitorPointId(Integer monitorPointId) {
+ QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("mac")
+ .eq("monitor_point_id", monitorPointId)
+ .eq("is_delete", Constants.NOT_DELETE);
+ return deviceMapper.selectObjs(queryWrapper);
+ }
+
+ @Override
public List getMacsByOrgIdAndRegionCode(Integer organizationId, Integer regionCode) {
QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
queryWrapper.select("mac")
@@ -570,13 +628,17 @@
long diff = end.getTime() - start.getTime(); //������������
long hour = (diff / nh)+1; //������������������������
-
- List<OnlineRateVo> OnlineRateVoList = deviceMapper.getLists(onlineRatePageCond.getOrganizationId(),onlineRatePageCond.getState());
+ Map<String, List<OnlineRateVo>> collectList=new HashMap<>();
+// List<OnlineRateVo> OnlineRateVoList = deviceMapper.getLists(onlineRatePageCond.getOrganizationId(),onlineRatePageCond.getState());
+ List<OnlineRateVo> OnlineRateVoList = deviceMapper.getLists(onlineRatePageCond.getMacs(),onlineRatePageCond.getState());
if (!ObjectUtils.isEmpty(OnlineRateVoList)){
+
for (OnlineRateVo onlineRateVo : OnlineRateVoList) {
List<HistoryHourly> valueByMacAndTime = historyHourlyService.getValueByMacAndTime(onlineRateVo.getMac(), start, end);
ArrayList<Date> dates = new ArrayList<>();
+ //������������
ArrayList<Date> dates1 = new ArrayList<>();
+ //������������
ArrayList<Date> dates2 = new ArrayList<>();
ArrayList<Integer> list = new ArrayList<>();
Date start1 = DateUtils.getDate(startTime, DateUtils.yyyy_MM_dd_HH_EN);
@@ -614,18 +676,30 @@
}
start1 = DateUtils.getDateAddHour(start1,1);
}
- if (!ObjectUtils.isEmpty(dates2)){
- onlineRateVo.setStartTime(DateUtils.dateToDateString(dates2.get(dates2.size()-1)));
- }
if (!ObjectUtils.isEmpty(dates1)){
- onlineRateVo.setEndTime(DateUtils.dateToDateString(dates1.get(dates1.size()-1)));
+ if (dates1.size()>dates2.size()){
+ onlineRateVo.setEndTime(DateUtils.dateToDateString(dates1.get(dates1.size()-1)));
+ onlineRateVo.setStartTime("-");
+ onlineRateVo.setHourState("0");
+ }else {
+ onlineRateVo.setStartTime(DateUtils.dateToDateString(dates2.get(dates2.size()-1)));
+ onlineRateVo.setEndTime(DateUtils.dateToDateString(dates1.get(dates1.size()-1)));
+ onlineRateVo.setHourState("1");
+ }
+ }else {
+ onlineRateVo.setHourState("1");
}
-// it.setEndTime(DateUtils.dateToDateString(dates1.get(dates1.size()-1)));
+// if (!ObjectUtils.isEmpty(dates2)){
+// onlineRateVo.setStartTime(DateUtils.dateToDateString(dates2.get(dates2.size()-1)));
+// }
+// if (!ObjectUtils.isEmpty(dates1)){
+// onlineRateVo.setEndTime(DateUtils.dateToDateString(dates1.get(dates1.size()-1)));
+// }
onlineRateVo.setNum(dates1.size()+"");
onlineRateVo.setOnlineTime(collects.size());
double number = (double) collects.size() / hour * 100;
String result = String.format("%.2f", number);
- onlineRateVo.setOnlineRate(result+"%");
+ onlineRateVo.setOnlineRate(result);
}
}
@@ -683,7 +757,10 @@
}
});
}*/
- return OnlineRateVoList;
+ if (!ObjectUtils.isEmpty(OnlineRateVoList)){
+ collectList = OnlineRateVoList.stream().collect(Collectors.groupingBy(OnlineRateVo::getHourState));
+ }
+ return ObjectUtils.isEmpty(onlineRatePageCond.getHourState())?OnlineRateVoList:collectList.get(onlineRatePageCond.getHourState());
}
/**
@@ -741,11 +818,21 @@
}
}else {
if (flag){
- EndDates.add(start);
- flag=false;
+ Date date = new Date();
+ String dateString = DateUtils.dateToDateString(date, DateUtils.yyyy_MM_dd_HH_EN);
+ Date date1 = DateUtils.getDate(dateString, DateUtils.yyyy_MM_dd_HH_EN);
+ if (!date1.equals(start)){
+ EndDates.add(start);
+ flag=false;
+ }
}
map.put(DateUtils.dateToDateString(start),0);
}
+ start = DateUtils.getDateAddHour(start,1);
+ }
+ }else {
+ while (DateUtils.isTimeBeforE(end,start)){
+ map.put(DateUtils.dateToDateString(start),0);
start = DateUtils.getDateAddHour(start,1);
}
}
@@ -770,13 +857,7 @@
}
}
-// if (!ObjectUtils.isEmpty(StartDates)){
-// long l = EndDates.get(i).getTime() - StartDates.get(i).getTime();
-// onlineRateLogsForm.setMun(Long.toString(l/nh));
-// StartDates.remove(i);
-// }else {
-// onlineRateLogsForm.setMun("-");
-// }
+
onlineRateLogsForm.setDate("������");
OrfList.add(onlineRateLogsForm);
}
@@ -794,11 +875,9 @@
rsMap.put("tabulation",OrfList);
//���������������������
int endNumber = map.size() - dates.size();
- double number = (double) dates.size() / map.size() * 100;
- String result = String.format("%.2f", number);
rsMap.put("pieChart1",endNumber);
rsMap.put("pieChart2",dates.size());
- rsMap.put("code","���"+map.size()+"���������"+"������"+dates.size()+"���������"+"���������"+(result.equals("NaN")?"0":result));
+ rsMap.put("sum",map.size());
} else if (type.equals("day")){
Date start = DateUtils.getDate(startTime, DateUtils.yyyy_MM_dd_EN);
@@ -828,7 +907,11 @@
}
map.put(DateUtils.dateToDateString(start),0);
}
-// start = DateUtils.getDateAddHour(start,24);
+ start = DateUtils.getDateOfDay(start,1);
+ }
+ }else {
+ while (DateUtils.isTimeBeforE(end,start)){
+ map.put(DateUtils.dateToDateString(start),0);
start = DateUtils.getDateOfDay(start,1);
}
}
@@ -852,12 +935,6 @@
onlineRateLogsForm.setMun(Long.toString(Math.abs(l/nd)));
}
}
-// if (!ObjectUtils.isEmpty(StartDates)){
-// long l = EndDates.get(i).getTime() - StartDates.get(i).getTime();
-// onlineRateLogsForm.setMun(Long.toString(l/nd));
-// }else {
-// onlineRateLogsForm.setMun("-");
-// }
onlineRateLogsForm.setDate("���");
OrfList.add(onlineRateLogsForm);
}
@@ -871,20 +948,24 @@
list2.add(Integer.parseInt(map.get(string).toString()));
}
-
rsMap.put("lineChart1",list1);
rsMap.put("lineChart2",list2);
rsMap.put("tabulation",OrfList);
//���������������
int endNumber = map.size() - dates.size();
- double number = (double) dates.size() / map.size() * 100;
- String result = String.format("%.2f", number);
rsMap.put("pieChart1",endNumber);
rsMap.put("pieChart2",dates.size());
- rsMap.put("code","���"+map.size()+"������"+"������"+dates.size()+"������"+"���������"+(result.equals("NaN")?"0":result));
+ rsMap.put("sum",map.size());
}else {
Date start = DateUtils.getDate(startTime,DateUtils.yyyy_MM_dd_HH_mm_EN);
Date end = DateUtils.getDate(endTime, DateUtils.yyyy_MM_dd_HH_mm_EN);
+ Date date = new Date();
+ String dateString = DateUtils.dateToDateString(date, DateUtils.yyyy_MM_dd_HH_mm_EN);
+ Date date1 = DateUtils.getDate(dateString, DateUtils.yyyy_MM_dd_HH_mm_EN);
+ if (end.equals(date1)){
+ String dateOfMin = DateUtils.getDateOfMin(dateString, -1, DateUtils.yyyy_MM_dd_HH_mm_EN);
+ end = DateUtils.getDate(dateOfMin, DateUtils.yyyy_MM_dd_HH_mm_EN);
+ }
List<HistoryMinutely> historyMinutelys = historyHourlyService.getHistoryMinutely(mac, start, end);
if (!ObjectUtils.isEmpty(historyMinutelys)){
//������������
@@ -910,7 +991,11 @@
}
map.put(DateUtils.dateToDateString(start),0);
}
-// start = DateUtils.getDateAddHour(start,24);
+ start = DateUtils.getDateOfMin(start,1);
+ }
+ }else {
+ while (DateUtils.isTimeBeforE(end,start)){
+ map.put(DateUtils.dateToDateString(start),0);
start = DateUtils.getDateOfMin(start,1);
}
}
@@ -934,12 +1019,6 @@
onlineRateLogsForm.setMun(Long.toString(Math.abs(l/nm)));
}
}
-// if (!ObjectUtils.isEmpty(StartDates)){
-// long l = EndDates.get(i).getTime() - StartDates.get(i).getTime();
-// onlineRateLogsForm.setMun(Long.toString(l/nm));
-// }else {
-// onlineRateLogsForm.setMun("-");
-// }
onlineRateLogsForm.setDate("������");
OrfList.add(onlineRateLogsForm);
}
@@ -957,13 +1036,37 @@
rsMap.put("tabulation",OrfList);
//���������������
int endNumber = map.size() - dates.size();
- double number = (double) dates.size() / map.size() * 100;
- String result = String.format("%.2f", number);
rsMap.put("pieChart1",endNumber);
rsMap.put("pieChart2",dates.size());
- rsMap.put("code","���"+map.size()+"���������"+"������"+dates.size()+"���������"+"���������"+(result.equals("NaN")?"0":result));
+ rsMap.put("sum",map.size());
}
return rsMap;
+ }
+
+ @Override
+ public Map<String,Object> getStart(List<String> macs) {
+ HashMap<String, Object> map = new HashMap<>();
+ List<OnlineRateVo> lists = deviceMapper.getLists(macs, null);
+ if (!ObjectUtils.isEmpty(lists)){
+ Map<String, List<OnlineRateVo>> collect = lists.stream().collect(Collectors.groupingBy(OnlineRateVo::getState));
+ int size1 = lists.size();
+ List<OnlineRateVo> onlineRateVos = collect.get("0");
+ int i ;
+ if (!ObjectUtils.isEmpty(onlineRateVos)){
+ int size = onlineRateVos.size();
+ i = size1 - size;
+ }else {
+ i= size1;
+ }
+ //������
+ map.put("sum",lists.size());
+ //������
+ map.put("online",i);
+ double number = (double) i / size1 * 100;
+ String result = String.format("%.2f", number);
+ map.put("onlineRate",result);
+ }
+ return map;
}
@Override
@@ -1152,4 +1255,10 @@
}
return OrfList;
}
+ private boolean subStr(String mac){
+ if(StringUtils.isNotEmpty(mac)&&mac.contains(",avg")){
+ return true;
+ }
+ return false;
+ }
}
--
Gitblit v1.8.0