blame | history | patch | commit | commitdiff | ignore whitespace
cjl
2023-12-14 6992aaf0587c09f7c511c1afd12e1519d91363d3 
 screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java


@@ -39,6 +39,7 @@


import org.springframework.stereotype.Service;


import org.springframework.util.ObjectUtils;




import java.text.DecimalFormat;


import java.util.*;


import java.util.stream.Collectors;




@@ -190,7 +191,21 @@


        }


        return getWindData(windData,params);


    }


    @Override


    public List<Object> getAreaWindDataCenter(Map<String, Object> params) {


//        String timeUnits = DateUtils.dateToDateString(new Date(), DateUtils.yyyyMM_EN);


//        params.put("timeUnits", timeUnits);


//        //风场数据


//        List<WindData> windData = historyFiveMinutelyMapper.getAreaWindData(params);


//        return getWindData(windData);




        params.put("timeUnits","202311");


        params.put("time","2023-11-05 09:00");


        params.put("macs",Arrays.asList("p5dnd7a0245472","p5dnd7a0245400","p5dnd7a0245385","p5dnd7a0245374"));


        List<WindData> windData = historyHourlyMapper.getArea(params);


        params.put("perdlen",50);


        return getWindData(windData,params);


    }




    //获取五分钟弹窗数据


    @Override


@@ -292,6 +307,7 @@




            }


        }


        String str = new DecimalFormat("#.######").format(Double.parseDouble(result.get("a21005").toString()));


        QueryFiveDataByMacVO queryFiveDataByMacVO = new QueryFiveDataByMacVO();


        queryFiveDataByMacVO.setName(device.getName());


        queryFiveDataByMacVO.setDataTime(datas.get("dataTime").toString());


@@ -299,7 +315,7 @@


        queryFiveDataByMacVO.setA34002(result.get("a34002").toString());


        queryFiveDataByMacVO.setA21026(result.get("a21026").toString());


        queryFiveDataByMacVO.setA21004(result.get("a21004").toString());


        queryFiveDataByMacVO.setA21005(result.get("a21005").toString());


        queryFiveDataByMacVO.setA21005(str);


        queryFiveDataByMacVO.setA05024(result.get("a05024").toString());


        queryFiveDataByMacVO.setA01008(result.get("a01008").toString());


        queryFiveDataByMacVO.setA01007(result.get("a01007").toString());


@@ -460,7 +476,7 @@


        laLaMap.put("minLa", lami);






        int perdlen = windDate(Objects.nonNull(params.get("monitorPointList"))?params.get("monitorPointList").toString():null);


        int perdlen = Objects.nonNull(params.get("perdlen"))?Integer.parseInt(params.get("perdlen").toString()):windDate(Objects.nonNull(params.get("monitorPointList"))?params.get("monitorPointList").toString():null);


        int length = perdlen*10;




        Double lo1 = lomi - length * 0.00001141;