设备新增逻辑调整

zengh

2021-05-12 39abbde096789b2f64e8060156f7c569d2a3e845

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

@@ -387,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()){
         //如果不是数字，则需调用接口匹配数据(直接取区、县参数)
@@ -410,6 +415,7 @@
//         catalogService.updateCatalog(deviceName,deviceNumber,pId);
//      }

		
      return R.status(equipmentService.saveOrUpdate(equipment));
   }

@@ -432,6 +438,10 @@
         equipment.setHeartbeat(null);
      }

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

//      String deviceName = equipment.getDeviceName();
//      String deviceNumber = equipment.getDeviceNumber();
//      String pId = equipment.getPid();