From 0bd7f0dee66640bab77123827cd083db4bec53a7 Mon Sep 17 00:00:00 2001
From: cjl <chenjl@deyt.cn>
Date: Thu, 06 Jul 2023 22:29:24 +0800
Subject: [PATCH] refactor: 导出格式和内容进行优化重构
---
screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java | 151 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 151 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
index f2aa5c0..27bd715 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
@@ -314,6 +314,145 @@
return resultList;
}
+ @Override
+ public List<Map<String, Object>> getHourlyDataDataV3Excel(Map<String, Object> params) {
+ List<String> macs = (List<String>) params.remove("macs");
+ List<String> times = (List<String>) params.remove("times");
+ String type = params.get("type").toString();
+ String startTime = times.get(0);
+ String endTime = times.get(1);
+
+// String[] macs = params.remove("macs").toString().split(",");
+// List<String> macsList = Arrays.asList(macs);
+ QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("is_delete",Constants.NOT_DELETE);
+ queryWrapper.in("mac", macs);
+ List<Device> devices = deviceMapper.selectList(queryWrapper);
+ if (devices.size()<=0){
+ return null;
+ }
+ String[] sensors = params.remove("sensors").toString().split(",");
+ List<String> sensorsList = Arrays.asList(sensors);
+ List<Map<String,Object>> resultList = new ArrayList<>();
+
+// List<String> sensorsList = (List<String>) params.remove("sensors");
+// String startTime = params.get("startTime").toString();
+// String endTime = params.get("endTime").toString();
+ if (type.equals("hours")){
+ Date startDate = DateUtils.getDate(startTime,DateUtils.yyyy_MM_dd_HH_EN);
+ Date endDate = DateUtils.getDate(endTime,DateUtils.yyyy_MM_dd_HH_EN);
+ List<HistoryHourly> hourlies = historyHourlyService.getValueByMacAndTime(macs, DateUtils.getDate(startTime, DateUtils.yyyy_MM_dd_HH_EN), DateUtils.getDate(endTime, DateUtils.yyyy_MM_dd_HH_EN));
+ Map<String,Map<String,Object>> map = resultMap(hourlies);
+ Map<Integer,String> pointMap = pointMap(devices);
+ Map<String,String> sensorMap = sensorMap(sensorsList);
+
+ for (Device device:devices) {
+ Date ks = DateUtils.getDate(startTime,"yyyy-MM-dd HH");
+ Date js = DateUtils.getDateAddHour(DateUtils.getDate(endTime,"yyyy-MM-dd HH"),1);
+ while (DateUtils.isTimeBefor(js,ks)){
+ Map<String, Object> timeValueMap = new LinkedHashMap<>();//key���time���value������������json
+ timeValueMap.put("������������",pointMap.get(device.getMonitorPointId()));
+ timeValueMap.put("name",device.getName());
+ String c = DateUtils.dateToDateString(ks,DateUtils.yyyy_MM_dd_HH_EN);
+ timeValueMap.put("������",c);
+ for (String sensor:sensorsList) {
+ String k = c+"_"+device.getMac();
+ Double num = 0d;
+ if(map.containsKey(k)){
+ Object o = map.get(k).get(sensor);
+ num = Objects.nonNull(o)?Double.valueOf(o.toString()):0d;
+ }
+ timeValueMap.put(sensorMap.get(sensor),num);
+ }
+ resultList.add(timeValueMap);
+ ks = DateUtils.getDateAddHour(ks,1);
+ }
+ }
+ } else if("day".equals(type)){
+ Date startDate = DateUtils.getDate(startTime,DateUtils.yyyy_MM_dd_HH_EN);
+ Date endDate = DateUtils.getDate(endTime,DateUtils.yyyy_MM_dd_HH_EN);
+ List<HistoryDaily> historyDailyByMacAndTimeSlot = historyDailyService.getHistoryDailyByMacAndTimeSlot(macs, startDate, endDate);
+ Map<String,Map<String,Object>> map = resultMap(historyDailyByMacAndTimeSlot,new ArrayList<>());
+ Map<Integer,String> pointMap = pointMap(devices);
+ Map<String,String> sensorMap = sensorMap(sensorsList);
+ for (Device device:devices) {
+ Date ks = DateUtils.getDate(startTime,"yyyy-MM-dd");
+ Date js = DateUtils.getDateOfDay(DateUtils.getDate(endTime,"yyyy-MM-dd"),1);
+ while (DateUtils.isTimeBefor(js,ks)){
+ Map<String, Object> timeValueMap = new LinkedHashMap<>();//key���time���value������������json
+ timeValueMap.put("������������",pointMap.get(device.getMonitorPointId()));
+ timeValueMap.put("name",device.getName());
+ String c = DateUtils.dateToDateString(ks,"yyyy-MM-dd");
+ timeValueMap.put("������",c);
+ for (String sensor:sensorsList) {
+ String k = c+"_"+device.getMac();
+ Double num = 0d;
+ if(map.containsKey(k)){
+ Object o = map.get(k).get(sensor);
+ num = Objects.nonNull(o)?Double.valueOf(o.toString()):0d;
+ }
+ timeValueMap.put(sensorMap.get(sensor),num);
+ }
+ resultList.add(timeValueMap);
+ ks = DateUtils.getDateOfDay(ks,1);
+ }
+ }
+
+ }else {
+ QueryWrapper<HistoryMonthly> HistoryMonthlyWrapper = new QueryWrapper<>();
+ HistoryMonthlyWrapper.in("mac",devices.stream().map(Device::getMac).collect(Collectors.toList()));
+ HistoryMonthlyWrapper.between("time",startTime,endTime);
+ List<HistoryMonthly> historyMonthlyList = historyMonthlyMapper.selectList(HistoryMonthlyWrapper);
+ Map<String,Map<String,Object>> map = resultMap(new ArrayList<>(),historyMonthlyList);
+ Map<Integer,String> pointMap = pointMap(devices);
+ Map<String,String> sensorMap = sensorMap(sensorsList);
+ for (Device device:devices) {
+ Date ks = DateUtils.getDate(startTime,"yyyy-MM");
+ Date js = DateUtils.addMonths(DateUtils.getDate(endTime,"yyyy-MM"),1);
+ while (DateUtils.isTimeBefor(js,ks)){
+ Map<String, Object> timeValueMap = new LinkedHashMap<>();//key���time���value������������json
+ timeValueMap.put("������������",pointMap.get(device.getMonitorPointId()));
+ timeValueMap.put("name",device.getName());
+ String c = DateUtils.dateToDateString(ks,"yyyy-MM");
+ timeValueMap.put("������",c);
+ for (String sensor:sensorsList) {
+ String k = c+"_"+device.getMac();
+ Double num = 0d;
+ if(map.containsKey(k)){
+ Object o = map.get(k).get(sensor);
+ num = Objects.nonNull(o)?Double.valueOf(o.toString()):0d;
+ }
+ timeValueMap.put(sensorMap.get(sensor),num);
+ }
+ resultList.add(timeValueMap);
+ ks = DateUtils.addMonths(ks,1);
+ }
+ /*for (String sensor:sensorsList) {
+ Date ks = DateUtils.getDate(startTime,"yyyy-MM");
+ Date js = DateUtils.addMonths(DateUtils.getDate(endTime,"yyyy-MM"),1);
+ Map<String, Object> timeValueMap = new LinkedHashMap<>();//key���time���value������������json
+ timeValueMap.put("������������",pointMap.get(device.getMonitorPointId()));
+ timeValueMap.put("name",device.getName());
+ timeValueMap.put("sensor",sensorMap.get(sensor));
+ while (DateUtils.isTimeBefor(js,ks)){
+ String c = DateUtils.dateToDateString(ks,"yyyy-MM");
+ String k = c+"_"+device.getMac();
+ if(map.containsKey(k)){
+ Object o = map.get(k).get(sensor);
+ timeValueMap.put(c,Objects.nonNull(o)?Double.valueOf(o.toString()):0);
+ }else {
+ timeValueMap.put(c,0);
+ }
+ ks = DateUtils.addMonths(ks,1);
+ }
+ resultList.add(timeValueMap);
+ }*/
+ }
+ }
+ return resultList;
+ }
+
+
private Map<String,Map<String,Object>> resultMap(List<HistoryDaily> list ,List<HistoryMonthly> historyMonthlyList){
Map<String,Map<String,Object>> map = new HashMap<>();
for(HistoryDaily h : list){
@@ -333,6 +472,18 @@
return map;
}
+ private Map<String,Map<String,Object>> resultMap(List<HistoryHourly> list){
+ Map<String,Map<String,Object>> map = new HashMap<>();
+ for(HistoryHourly h : list){
+ String dateStr = DateUtils.dateToDateString( h.getTime(), DateUtils.yyyy_MM_dd_HH_EN)+"_"+h.getMac();
+ Map<String,Object> jsonMap = new HashMap<>();
+ JSONObject jsonObject = JSONObject.parseObject(h.getValue());
+ jsonMap = jsonObject.getInnerMap();
+ map.put(dateStr,jsonMap);
+ }
+
+ return map;
+ }
private Map<String,String> sensorMap(List<String> sensorsList){
Map<String,String> map = new HashMap<>();
QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
--
Gitblit v1.8.0