From fdc8e1e781851904b05f234523f372c8c1098b69 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Thu, 01 Jul 2021 11:42:45 +0800 Subject: [PATCH] 定时任务CO.O3算法 --- screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java | 155 +++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 135 insertions(+), 20 deletions(-) diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java index fb85a9d..1b3c45d 100644 --- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java +++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java @@ -2,18 +2,26 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.OptionalDouble; +import java.util.stream.Collectors; +import java.util.stream.DoubleStream; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.moral.api.entity.Sensor; import com.moral.api.mapper.HistoryFiveMinutelyMapper; import com.moral.api.service.HistoryFiveMinutelyService; import com.moral.api.service.HistoryMinutelyService; +import com.moral.api.service.SensorService; +import com.moral.constant.Constants; +import com.moral.util.AmendUtils; import com.moral.util.DateUtils; @Service @@ -25,6 +33,9 @@ @Autowired private HistoryMinutelyService historyMinutelyService; + @Autowired + private SensorService sensorService; + @Override public void createTable(String timeUnits) { historyFiveMinutelyMapper.createTable(timeUnits); @@ -32,33 +43,137 @@ @Override public void insertHistoryFiveMinutely() { + //������������������yyyy-MM-dd HH:mm + String format = DateUtils.yyyy_MM_dd_HH_mm_EN; + Date now = new Date(); Map<String, Object> params = new HashMap<>(); - //������������������������ - Date start = DateUtils.convertDate(DateUtils.getDateOfMin(-5)); - //������������������������ - Date end = DateUtils.convertDate(new Date()); + //������������ + Date start = DateUtils.dataToTimeStampTime(DateUtils.getDateOfMin(now, -5), format); + //������������ + Date end = DateUtils.dataToTimeStampTime(now, format); params.put("start", start); params.put("end", end); - //��������������� + //������������������������������ String timeUnits = DateUtils.dateToDateString(start, DateUtils.yyyyMM_EN); params.put("timeUnits", timeUnits); //������ + QueryWrapper<Sensor> queryWrapper = new QueryWrapper<>(); + queryWrapper.select("code").eq("is_delete", Constants.NOT_DELETE); + List<Object> sensorCodes = sensorService.listObjs(queryWrapper); - params.put("sensorKeys", null); + //���������������������5������������ + List<Map<String, Object>> fiveMinutelyData = historyMinutelyService.getHistoryFiveMinutelyData(params); + //���mac������ + Map<String, List<Map<String, Object>>> data = fiveMinutelyData.parallelStream() + .collect(Collectors.groupingBy(o -> (String) o.get("mac"))); - historyMinutelyService.getHistoryFiveMinutelyData(params); - /*List<Map<String, Object>> list = new ArrayList<>(); - Map<String, Object> map = new HashMap<>(); - map.put("mac", "123456"); - Date date = new Date(); - map.put("time", date); - Map<String, Object> value = new HashMap<>(); - value.put("e1", 10); - value.put("e2", 20); - map.put("value", JSON.toJSONString(value)); - list.add(map);*/ + //��������������������������� + List<Map<String, Object>> insertData = new ArrayList<>(); - historyFiveMinutelyMapper.insertHistoryFiveMinutely(null, null); + data.forEach((key, value) -> { + Map<String, Object> dataMap = new HashMap<>(); + dataMap.put("mac", key); + dataMap.put("time", end); + Map<String, Object> jsonMap = new HashMap<>(); + + //��������������������������� + Object windDirAvg = AmendUtils.getWindDirAvg(value); + if (windDirAvg != null) { + jsonMap.put(Constants.SENSOR_CODE_WIND_DIR, windDirAvg); + } + + //������������������������������������ + sensorCodes.forEach(sensorCode -> { + OptionalDouble optionalDouble = value.parallelStream() + .flatMapToDouble(v -> { + Map<String, Object> dataValue = JSONObject.parseObject((String) v.get("value"), Map.class); + Object sensorValue = dataValue.get(sensorCode.toString()); + if (ObjectUtils.isEmpty(sensorValue)) { + return null; + } + //������������������ + if (Constants.SENSOR_CODE_WIND_DIR.equals(sensorCode)) { + return null; + } + return DoubleStream.of(Double.parseDouble(sensorValue.toString())); + }).average(); + if (optionalDouble.isPresent()) { + //��������������������� + double sciCal = AmendUtils.sciCal(optionalDouble.getAsDouble(), 4); + jsonMap.put(sensorCode.toString(), sciCal); + } + }); + dataMap.put("value", JSONObject.toJSONString(jsonMap)); + insertData.add(dataMap); + }); + + //5��������������� + String insertTimeUnits = DateUtils.dateToDateString(now, DateUtils.yyyyMM_EN); + //��������������� + historyFiveMinutelyMapper.insertHistoryFiveMinutely(insertData, insertTimeUnits); + } + + + public static void main(String[] args) { + /* //������������ + List<Map<String, Object>> list = new ArrayList<>(); + Map<String, Object> map1 = new HashMap<>(); + map1.put("mac", "p5dnd1234567"); + map1.put("value", "{\"a0001\": 10, \"a0002\": 8, \"a0001-Flag\": \"N\", \"a0002-Flag\": \"N\"}"); + Map<String, Object> map2 = new HashMap<>(); + map2.put("mac", "p5dnd123456789"); + map2.put("value", "{\"a0001\": 12, \"a0002\": 12, \"a0001-Flag\": \"N\", \"a0002-Flag\": \"N\"}"); + Map<String, Object> map3 = new HashMap<>(); + map3.put("mac", "p5dnd1234567"); + map3.put("value", "{\"a0001\": 6, \"a0002\": 20, \"a0001-Flag\": \"N\", \"a0002-Flag\": \"N\", \"a0003\": 14}"); + Map<String, Object> map4 = new HashMap<>(); + map4.put("mac", "p5dnd1234567"); + map4.put("value", "{\"a0001\": 4, \"a0002\": 16, \"a0001-Flag\": \"N\", \"a0002-Flag\": \"N\", \"a0003\": 16}"); + list.add(map1); + list.add(map2); + list.add(map3); + list.add(map4); + + //���������mac������ + Map<String, List<Map<String, Object>>> data = list.parallelStream().collect(Collectors.groupingBy(o -> (String) o.get("mac"))); + System.out.println(data); + + //������������ + List<Object> sensors = new ArrayList<>(); + sensors.add("a0001"); + sensors.add("a0002"); + sensors.add("a0003"); + + //������������������������ + List<Map<String, Object>> insertData = new ArrayList<>(); + + data.forEach((key, value) -> { + Map<String, Object> dataMap = new HashMap<>(); + Map<String, Object> jsonMap = new HashMap<>(); + dataMap.put("mac", key); + sensors.forEach(sensorCode -> { + OptionalDouble optionalDouble = value.parallelStream() + .flatMapToDouble(v -> { + Map<String, Object> dataValue = JSONObject.parseObject((String) v.get("value"), Map.class); + Object sensorValue = dataValue.get(sensorCode.toString()); + if (ObjectUtils.isEmpty(sensorValue)) { + return null; + } + return DoubleStream.of(Double.parseDouble(sensorValue.toString())); + }).average(); + if (optionalDouble.isPresent()) { + jsonMap.put(sensorCode.toString(), Double.parseDouble(String.format("%.4f", optionalDouble.getAsDouble()))); + } + }); + dataMap.put("value", JSONObject.toJSONString(jsonMap)); + insertData.add(dataMap); + }); + + + System.out.println("666==" + insertData);*/ + + double a = 5.5d; + System.out.println(Math.round(a)); } } -- Gitblit v1.8.0