南昌市物联网技防平台-后台
zengh
2021-04-22 b8eda5d6e9b20497c26214f2d8ba40d2c7ddfd47
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
@@ -342,6 +342,38 @@
   }
   /**
    * APP新增或修改
    */
   @PostMapping("/AppSubmit")
   @ApiOperationSupport(order = 6)
   @ApiOperation(value = "新增或修改", notes = "传入equipment")
   public R AppSubmit(@Valid EquipmentVO equipment) {
      if (equipment.getStime() != null && equipment.getStime().equals("")) {
         equipment.setStime(null);
      }
      if (equipment.getExpireTime() != null && equipment.getExpireTime().equals("")) {
         equipment.setExpireTime(null);
      }
      if (equipment.getHeartbeat() != null && equipment.getHeartbeat().equals("")) {
         equipment.setHeartbeat(null);
      }
//      String deviceName = equipment.getDeviceName();
//      String deviceNumber = equipment.getDeviceNumber();
//      String pId = equipment.getPid();
//      if (equipment.getId() == null){
//         catalogService.addCatalog(deviceName,deviceNumber,pId);
//      }else{
//         catalogService.updateCatalog(deviceName,deviceNumber,pId);
//      }
      System.out.println(equipment.getDeptId());
      return R.status(equipmentService.saveOrUpdate(equipment));
   }
   /**
    * 删除
    */
   @PostMapping("/remove")