设备健康列表

aijinhui

2023-09-26 6642bd2b06a87e8498bc83a0cc0e2a3d8ca2a582

 ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java

@@ -164,7 +164,7 @@
                                    //如果该父类集合在结构中已经存在并且不是设备数据就不用重复添加了
                                    Long treeId = treeDeptWells.get(l).getDeptId();
                                    Integer id = treeDeptWells.get(l).getId();
                                    if(ancestor.equals(treeId) && id==null){
                                    if(ancestor.equals(treeId)){
                                        wellTrue = true;
                                    }
                                }
@@ -312,20 +312,21 @@
        if ( (int) mapResult.get("code") == 200){
            j.put("code", mapResult.get("code"));
            List<Map<String , Object>> listResult = (List<Map<String, Object>>)JSON.parse((String)mapResult.get("resdata"));

            if(listResult.size()>0){
                for(int i = 0 ; i<listResult.size(); i++){
                    Map<String , Object> mapTemp = listResult.get(i);
                    int id = (Integer)mapTemp.get("id");   //主键id
                    BigDecimal value = (BigDecimal)mapTemp.get("Value");  //数值
                    String measureStr = (String)mapTemp.get("MeasureDate");  //测量时间
                    measureStr = measureStr.substring(measureStr.indexOf("(")+1, measureStr.indexOf(")",2));
                    SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                    String measureDate = f.format(Long.valueOf(measureStr));
                    mapTemp.put("MeasureDate", measureDate);
                    j.put(id +"" , mapTemp);
                    mapTemp.put("Value", value.setScale(2, BigDecimal.ROUND_HALF_UP));
                }
                j.put("data",listResult);
            }else {
                j.put("msg","无数据");
                j.put("data",new ArrayList<>());
            }
        }else{
            //错误提示