blame | history | patch | commit | commitdiff | ignore whitespace
cjl
2023-11-07 54beb665319b66742cdec3dffb7e298701d61582 
 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;




@@ -292,6 +293,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 +301,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());