APP接口调整

zengh

2021-05-11 47a458ca867f700ad8dfe8bccdbb6bf59ca2d301

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java

@@ -80,8 +80,25 @@
      response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
      response.setHeader("Access-Control-Allow-Credentials", "true");
      /*Equipment detail = equipmentService.getOne(Condition.getQueryWrapper(equipment));*/

      return R.data(equipmentService.selectInfo(equipment));
      EquipmentVOS equipmentVOS = equipmentService.selectInfo(equipment);
      //获取部门数据
      List<DeptVo> deptVos = deptFeignApi.selDeptList();
      if (null!=equipmentVOS.getDeptId()){
         String[] split =equipmentVOS.getDeptId().split(",");
         List<String> list = Arrays.asList(split);
         StringBuffer deptNameBuiffer = new StringBuffer();
         //数据匹配封装
         for (String deptId:list) {
            for (DeptVo deptVo:deptVos) {
               if (deptId.equals(deptVo.getId().toString())){
                  deptNameBuiffer.append(deptVo.getDeptName()).append("/");
               }
            }
         }
         //封装部门名称数据
         equipmentVOS.setDeptName(deptNameBuiffer.substring(0,deptNameBuiffer.length()-1));
      }
      return R.data(equipmentVOS);
   }

   /**
@@ -137,10 +154,7 @@
         }else{
            pages.get(j).setOnlineStatus("0");
         }

      }


      return R.data(pages);
   }

@@ -225,6 +239,7 @@
      List<DeptVo> deptVos = deptFeignApi.selDeptList();
      //获取设备数据信息
      IPage<EquipmentVO> page = equipmentService.selectDeptPages(Condition.getPage(query), equipment, pid, dxtype);
      System.out.println("page = " + page);
      //遍历数据
      for (int j = 0; j < page.getRecords().size(); j++) {
         if (null!=page.getRecords().get(j).getDeptId()){
@@ -261,7 +276,22 @@
               page.getRecords().get(j).setType(0);
            }
         }

         //判断设备是否在线
         String Heartbeat = page.getRecords().get(j).getHeartbeat();
         if (Heartbeat != null){
            long st = sim.parse(Heartbeat).getTime();
            long en = sim.parse(end).getTime();
            if ((en - st) >= (60 * 60 * 24 * 1000)){
               page.getRecords().get(j).setOnlineStatus("0");
            }else{
               page.getRecords().get(j).setOnlineStatus("1");
            }
         }else{
            page.getRecords().get(j).setOnlineStatus("0");
         }
      }


      return R.data(page);
   }
@@ -520,4 +550,14 @@
      return R.data(map);
   }

   /**
    * 监控台统计
    * @author arsn 2021-5-6
    * @return
    */
   @PostMapping("/SeleCs")
   public R SeleCs() {
      return R.data(equipmentService.selEqTypeSum());
   }

}