forked from moral

parent: 2e1d289a | patch | commit | ignore whitespace
jinpengyong
2023-12-15 2c4bc4b044f8ff9a912446947db70694fd48442c 
chore:测试提交
1 files modified
24 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java 24 ●●●●● patch | view | raw | blame | history 
 screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java


@@ -307,19 +307,23 @@




            }


        }


        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());


        queryFiveDataByMacVO.setA34004(result.get("a34004").toString());


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


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


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


        queryFiveDataByMacVO.setA21005(str);


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


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


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


        queryFiveDataByMacVO.setA99054(result.get("a99054").toString());


        if (!ObjectUtils.isEmpty(result.get("a21005"))){


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


            queryFiveDataByMacVO.setA21005(str);


        }


//        queryFiveDataByMacVO.setA34004(result.get("a34004").toString());


        queryFiveDataByMacVO.setA34004(ObjectUtils.isEmpty(result.get("a34004"))?null:result.get("a34004").toString());


        queryFiveDataByMacVO.setA34002(ObjectUtils.isEmpty(result.get("a34002"))?null:result.get("a34002").toString());


        queryFiveDataByMacVO.setA21026(ObjectUtils.isEmpty(result.get("a21026"))?null:result.get("a21026").toString());


        queryFiveDataByMacVO.setA21004(ObjectUtils.isEmpty(result.get("a21004"))?null:result.get("a21004").toString());


        queryFiveDataByMacVO.setA05024(ObjectUtils.isEmpty(result.get("a05024"))?null:result.get("a05024").toString());


        queryFiveDataByMacVO.setA01008(ObjectUtils.isEmpty(result.get("a01008"))?null:result.get("a01008").toString());


        queryFiveDataByMacVO.setA01007(ObjectUtils.isEmpty(result.get("a01007"))?null:result.get("a01007").toString());


        queryFiveDataByMacVO.setA99054(ObjectUtils.isEmpty(result.get("a99054"))?null:result.get("a99054").toString());




        return queryFiveDataByMacVO;


    }