From faf8649ff22b8af12c758355725389204838e02a Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 05 Aug 2021 13:23:54 +0800
Subject: [PATCH] 小时缺失数据补充定时任务

---
 screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java |   77 +++-----------------------------------
 1 files changed, 7 insertions(+), 70 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 368cfb5..ecdfd80 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
@@ -19,8 +19,8 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.moral.api.entity.Sensor;
 import com.moral.api.mapper.HistoryFiveMinutelyMapper;
+import com.moral.api.mapper.HistoryMinutelyMapper;
 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.constant.RedisConstants;
@@ -34,18 +34,18 @@
     private HistoryFiveMinutelyMapper historyFiveMinutelyMapper;
 
     @Autowired
-    private HistoryMinutelyService historyMinutelyService;
+    private HistoryMinutelyMapper historyMinutelyMapper;
 
     @Autowired
     private SensorService sensorService;
+
+    @Autowired
+    private RedisTemplate redisTemplate;
 
     @Override
     public void createTable(String timeUnits) {
         historyFiveMinutelyMapper.createTable(timeUnits);
     }
-
-    @Autowired
-    private RedisTemplate redisTemplate;
 
     @Override
     @Transactional
@@ -69,8 +69,8 @@
         queryWrapper.select("code").eq("is_delete", Constants.NOT_DELETE);
         List<Object> sensorCodes = sensorService.listObjs(queryWrapper);
 
-        //���������������������5������������
-        List<Map<String, Object>> fiveMinutelyData = historyMinutelyService.getHistoryFiveMinutelyData(params);
+        //���������������������5������������������
+        List<Map<String, Object>> fiveMinutelyData = historyMinutelyMapper.getHistoryMinutelyData(params);
         if (fiveMinutelyData.size() == 0) {
             return;
         }
@@ -125,68 +125,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