设备新增逻辑调整

zengh

2021-05-12 fd5f5f8e45e5e4195694e34b6f7bf481e85bcabc

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

@@ -275,7 +275,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);
   }
@@ -372,6 +387,11 @@
      if (equipment.getHeartbeat() != null && equipment.getHeartbeat().equals("")) {
         equipment.setHeartbeat(null);
      }

      if (equipment.getDtype() == null || equipment.getDtype().equals("")) {
         equipment.setDtype("0");
      }

      //判断省市区的值是否为数字或者中文字符串
      if(null!=equipment.getProvince()){
         //如果不是数字，则需调用接口匹配数据(直接取区、县参数)
@@ -415,6 +435,10 @@

      if (equipment.getHeartbeat() != null && equipment.getHeartbeat().equals("")) {
         equipment.setHeartbeat(null);
      }

      if (equipment.getDtype() == null || equipment.getDtype().equals("")) {
         equipment.setDtype("0");
      }

//      String deviceName = equipment.getDeviceName();
@@ -534,4 +558,14 @@
      return R.data(map);
   }

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

}