Merge remote-tracking branch 'origin/wb' into wb

cjl

2023-09-27 dc1c8c974d9469591ead4dd1d774bbfb97a33331

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

@@ -5,10 +5,13 @@
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.apache.commons.collections4.CollectionUtils;
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.*;
@@ -874,33 +877,37 @@


    @Override
    public boolean historyHourly() {
        String time = "2023-08-16 21:00:00";
        String table = "202308";

        String timeEnd = "2023-08-17 00:00:00";
        String tableEnd = "202308";
        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");
    public boolean historyHourly(HistoryHourlyVo historyHourlyVo) {
        String time = historyHourlyVo.getTime();
        String table = historyHourlyVo.getTable();
        String timeEnd = historyHourlyVo.getTimeEnd();
        String tableEnd =historyHourlyVo.getTableEnd();
        List<String> macList = deviceMapper.deviceMacs(historyHourlyVo.getOrganizationId());
        if(CollectionUtils.isEmpty(macList)){
            return false;
        }
        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;
            dataResult.put("a34004",Double.parseDouble(data.get("a34004").toString())+3);
            dataResult.put("a34002",Double.parseDouble(data.get("a34002").toString())+3);
            dataResult.put("a21004",Double.parseDouble(data.get("a21004").toString())+4);
            dataResult.put("a21005",Double.parseDouble(data.get("a05024").toString())-35);
       /*     dataResult.put("a05024",Double.parseDouble(data.get("a05024").toString())-20);
            dataResult.put("a01002",Double.parseDouble(data.get("a01002").toString())+2);
            dataResult.put("a99054",Double.parseDouble(data.get("a99054").toString())+0.05);*/
            //a34004:pm2.5   a34002:pm10  a05024:O3  a21005:CO  a21026:So2  a21004:NO2 a99054:tovc
            dataResult.put("a34004",Objects.isNull(data.get("a34004"))||data.get("a34004").toString().equals("0")?0d:Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a34004").toString())+historyHourlyVo.getA34004())));
            dataResult.put("a34002",Objects.isNull(data.get("a34002"))||data.get("a34002").toString().equals("0")?0d:Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a34002").toString())+historyHourlyVo.getA34002())));
            dataResult.put("a05024",Objects.isNull(data.get("a05024"))||data.get("a05024").toString().equals("0")?0d:Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a05024").toString())+historyHourlyVo.getA05024())));
            dataResult.put("a21005",Objects.isNull(data.get("a21005"))||data.get("a21005").toString().equals("0")?0d:Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a21005").toString())+historyHourlyVo.getA21005())));
            dataResult.put("a21026",Objects.isNull(data.get("a21026"))||data.get("a21026").toString().equals("0")?0d:Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a21026").toString())+historyHourlyVo.getA21026())));
            dataResult.put("a21004",Objects.isNull(data.get("a21004"))||data.get("a21004").toString().equals("0")?0d:Double.parseDouble(String.format("%.4f",Double.parseDouble(data.get("a21004").toString())+historyHourlyVo.getA21004())));
            dataResult.put("a99054",Objects.isNull(data.get("a99054"))||data.get("a99054").toString().equals("0")?0d: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.insertHistoryHourly(map);
            historyHourlyMapper.updateHistoryHourly(map);
        }
        return true;
    }