blame | history | patch | commit | commitdiff | ignore whitespace
cjl
2023-08-28 65c692a8174659c446384bcfeb967ce62600d58c 
 screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java


@@ -1,22 +1,19 @@


package com.moral.api.service.impl;




import com.alibaba.fastjson.JSON;


import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;


import com.moral.api.entity.*;


import com.moral.api.mapper.ServicesScopeDeviceMapper;


import com.moral.api.mapper.ServicesScopeMapper;


import com.moral.api.vo.HistoryHourlyVo;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Service;


import org.springframework.util.ObjectUtils;




import java.text.DecimalFormat;


import java.text.ParseException;


import java.text.SimpleDateFormat;


import java.util.ArrayList;


import java.util.Calendar;


import java.util.Collections;


import java.util.Date;


import java.util.HashMap;


import java.util.List;


import java.util.Map;


import java.util.OptionalDouble;


import java.util.*;


import java.util.function.Supplier;


import java.util.stream.Collectors;


import java.util.stream.DoubleStream;


@@ -755,6 +752,15 @@


        List<HistoryHourly> datas = multiTableQuery(wrapper, tableNames);


        return datas;


    }


    @Override


    public List<HistoryHourly> getValueByMacAndTime(List<String> mac, Date startDate, Date endDate) {


        QueryWrapper<HistoryHourly> wrapper = new QueryWrapper<>();


        wrapper.in("mac", mac);


        wrapper.between("time", startDate, endDate);


        List<String> tableNames = MybatisPLUSUtils.getTableNamesByWrapper(startDate, endDate, SeparateTableType.MONTH);


        List<HistoryHourly> datas = multiTableQuery(wrapper, tableNames);


        return datas;


    }




    @Override


    public List<HistoryHourly> getValueByMacs(List<String> macs, String time) {


@@ -868,4 +874,42 @@


//        return historyHourlyMapper.getDataByMac(mac,time,yearAndMonth);


//    }






    @Override


    public boolean historyHourly(HistoryHourlyVo historyHourlyVo) {




        /*String time = "2023-08-27 05:00:00";


        String table = "202308";


        String timeEnd = "2023-08-27 05:00:00";


        String tableEnd = "202308";*/


        String time = historyHourlyVo.getTime();


        String table = historyHourlyVo.getTable();


        String timeEnd = historyHourlyVo.getTimeEnd();


        String tableEnd =historyHourlyVo.getTableEnd();


        List<String> macList = Arrays.asList("p5dnd7a0245406","p5dnd7a0245427","p5dnd7a0245412","p5dnd7a0245400","p5dnd7a0245472","p5dnd7a0245384","p5dnd7a0245374","p5dnd7a0245401","p5dnd7a0245423","p5dnd7a0245438","p5dnd7a0245363","p5dnd7a0245375","p5dnd7a0245444","p5dnd7a0245437","p5dnd7a0245367","p5dnd7a0245392","p5dnd7a0245471","p5dnd7a0245433","p5dnd7a0245361","p5dnd7a0245362","p5dnd7a0245436","p5dnd7a0245373","p5dnd7a0245370","p5dnd7a0245357","p5dnd7a0245434","p5dnd7a0245353","p5dnd7a0245381","p5dnd7a0245421","p5dnd7a0245399","p5dnd7a0245409","p5dnd7a0245422","p5dnd7a0245470","p5dnd7a0245359","p5dnd7a0245393","p5dnd7a0245371","p5dnd7a0245382","p5dnd7a0245385","p5dnd7a0245443","p5dnd7a0245424","p5dnd7a0245369","p5dnd7a0245389","p5dnd7a0245391","p5dnd7a0245356","p5dnd7a0245396","p5dnd7a0243567","p5dnd7a0243568");


        List<Map<String,Object>>  listMap = historyHourlyMapper.selectDataByMacsAndTime(table, macList, time);


        for (Map historyHourlyData : listMap) {


            String mac = historyHourlyData.get("mac").toString();


            Map<String, Object> data = JSON.parseObject(historyHourlyData.get("value").toString(), Map.class);


            Map<String, Object> dataResult = new HashMap<>();


            dataResult = data;


            //a34004:pm2.5   a34002:pm10  a05024:O3  a21005:CO  a21026:So2  a21004:NO2 a99054:tovc


            dataResult.put("a34004",Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a34004").toString())+historyHourlyVo.getA34004())));


            dataResult.put("a34002",Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a34002").toString())+historyHourlyVo.getA34002())));


            dataResult.put("a05024",Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a05024").toString())+historyHourlyVo.getA05024())));


            dataResult.put("a21005",Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a21005").toString())+historyHourlyVo.getA21005())));


            dataResult.put("a21026",Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a21026").toString())+historyHourlyVo.getA21026())));


            dataResult.put("a21004",Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a21004").toString())+historyHourlyVo.getA21004())));


            dataResult.put("a99054",Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a99054").toString())+historyHourlyVo.getA99054())));


            Map<String, Object> map = new HashMap<>();


            map.put("timeUnits",tableEnd);


            map.put("time",timeEnd);


            map.put("value",JSONObject.toJSONString(dataResult));


            map.put("version","35");


            map.put("mac",mac);


           // historyHourlyMapper.insertHistoryHourly(map);


            historyHourlyMapper.updateHistoryHourly(map);


        }


        return true;


    }


}