设备新增逻辑调整

zengh

2021-05-12 39abbde096789b2f64e8060156f7c569d2a3e845

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

@@ -388,8 +388,8 @@
         equipment.setHeartbeat(null);
      }

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

      //判断省市区的值是否为数字或者中文字符串
@@ -415,6 +415,7 @@
//         catalogService.updateCatalog(deviceName,deviceNumber,pId);
//      }

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

@@ -437,8 +438,8 @@
         equipment.setHeartbeat(null);
      }

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

//      String deviceName = equipment.getDeviceName();