fix:秒级数据调整补充提交

cjl

2023-10-13 c191d6d093b52badf95da4b661a0a95f3178377d

 screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java

@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.HistoryDaily;
import com.moral.api.entity.HistoryHourly;
import com.moral.api.entity.Sensor;
import com.moral.api.mapper.HistoryDailyMapper;
import com.moral.api.service.HistoryDailyService;
@@ -18,7 +17,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;

import javax.xml.crypto.Data;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -50,9 +51,14 @@

    @Override
    @Transactional
    public void insertHistoryDaily() {
    public void insertHistoryDaily(String time) {
        String format = DateUtils.yyyy_MM_dd_EN;
        Date now = new Date();
        Date now;
        if(StringUtils.isEmpty(time)){
            now = new Date();
        } else {
            now = DateUtils.getDate(time,"yyyy-MM-dd");
        }
        //开始时间，昨日
        Date start = DateUtils.dataToTimeStampTime(DateUtils.getDateOfDay(now, -1), format);
        //结束时间，今日
@@ -61,12 +67,16 @@
        QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
        sensorQueryWrapper.select("code", "lower", "upper").eq("is_delete", Constants.NOT_DELETE);
        List<Sensor> sensors = sensorService.list(sensorQueryWrapper);

        //获取所有设备小时数据
        QueryWrapper<HistoryHourly> historyHourlyQueryWrapper = new QueryWrapper<>();
        historyHourlyQueryWrapper.ge("time", DateUtils.dateToDateString(start)).le("time", DateUtils.dateToDateString(end));
        List<Map<String, Object>> dailyData = historyHourlyService.listMaps(historyHourlyQueryWrapper);
        Map<String, Object> prop = new HashMap<>();
        String timeUnits = DateUtils.dateToDateString(start, DateUtils.yyyyMM_EN);
        prop.put("timeUnits", timeUnits);
        prop.put("start", DateUtils.dateToDateString(start));
        prop.put("end", DateUtils.dateToDateString(end));
        List<Map<String, Object>> dailyData = historyHourlyService.selectDailyData(prop);

        if (dailyData.size() == 0) {
            System.out.println("没有小时数据"+DateUtils.dateToDateString(start));
            return;
        }

@@ -76,17 +86,11 @@
        //存入数据库的结果集
        List<Map<String, Object>> insertData = new ArrayList<>();

        data.forEach((key, value) -> {
        data.forEach((mac, value) -> {
            Map<String, Object> dataMap = new HashMap<>();
            Map<String, Object> jsonMap = new HashMap<>();
            dataMap.put("mac", key);
            dataMap.put("mac", mac);
            dataMap.put("time", start);

            //中间变量，用于计算除臭氧外其它因子
            List<Map<String, Object>> tempValue = new ArrayList<>(value);

            //移除第一天数据（0点的），O3滑动值第一天数据是从1点-8点
            value.removeIf(map -> ((Date) map.get("time")).getTime() == start.getTime());

            Map<String, Object> params = new HashMap<>();
            params.put("data", value);
@@ -129,12 +133,8 @@
            if (!ObjectUtils.isEmpty(o3AvgOfDay)) {
                jsonMap.putAll(o3AvgOfDay);
            }
            //除臭氧外其他因子均值计算
            tempValue.removeIf(o -> ((Date) o.get("time")).getTime() == end.getTime());

            //风向均值计算并修约
            params.put("data", tempValue);

            Map<String, Object> windDirAvg = AmendUtils.getWindDirAvg(params);
            if (!ObjectUtils.isEmpty(windDirAvg)) {
                jsonMap.putAll(windDirAvg);
@@ -144,7 +144,7 @@
                String sensorCode = sensor.getCode();
                Double upper = sensor.getUpper();
                Double lower = sensor.getLower();
                OptionalDouble optionalDouble = tempValue.parallelStream()
                OptionalDouble optionalDouble = value.parallelStream()
                        .flatMapToDouble(v -> {
                            Map<String, Object> dataValue = JSONObject.parseObject((String) v.get("value"), Map.class);
                            Object sensorValue = dataValue.get(sensorCode);
@@ -155,7 +155,6 @@
                            }

                            if (ObjectUtils.isEmpty(sensorValue)) {
                                System.out.println(456);
                                return null;
                            }

@@ -167,19 +166,15 @@
                            //剔除数据超过上下限的数据
                            double aDouble = Double.parseDouble(sensorValue.toString());
                            if (!ObjectUtils.isEmpty(upper)) {
                                if (aDouble < upper) {
                                if (aDouble > upper) {
                                    return null;
                                }
                            }
                            if (!ObjectUtils.isEmpty(lower)) {
                                if (aDouble > lower) {
                                if (aDouble < lower) {
                                    return null;
                                }
                            }
                            if ("a00e12".equals(sensorCode)) {
                                System.out.println(key + "==" + sensorCode + "==" + v.get("time") + "==" + aDouble);
                            }

                            return DoubleStream.of(aDouble);
                        }).average();
                if (optionalDouble.isPresent()) {
@@ -191,8 +186,8 @@
            dataMap.put("value", JSONObject.toJSONString(jsonMap));
            insertData.add(dataMap);
        });

        //存入数据库
        historyDailyMapper.insertHistoryDaily(insertData);
        System.out.println("补偿完成");
    }
}