1.App警情反馈接口调整 2.租户接口新增

tangzy

2021-04-25 a4ff2b571be305e2641c9dd67797f4102e795ebb

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

@@ -93,8 +93,8 @@
   @GetMapping("/listAll")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "分页", notes = "传入equipment")
   public R<List<EquipmentVO>> listAll(Equipment equipment, Query query) throws ParseException {
      List<EquipmentVO> pages = equipmentService.listAll();
   public R<List<EquipmentVO>> listAll(EquipmentVO equipment, Query query) throws ParseException {
      List<EquipmentVO> pages = equipmentService.listAll(equipment);

      for (int j = 0; j < pages.size(); j++) {
         String expireTime = pages.get(j).getExpireTime();
@@ -114,6 +114,22 @@
               pages.get(j).setType(0);
            }
         }


         //判断设备是否在线
         String Heartbeat = pages.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)){
               pages.get(j).setOnlineStatus("0");
            }else{
               pages.get(j).setOnlineStatus("1");
            }
         }else{
            pages.get(j).setOnlineStatus("0");
         }

      }


@@ -326,6 +342,42 @@
   }

   /**
    * 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);
//      }

      if (equipment.getPaddress() != null && !equipment.getPaddress().equals("")) {
         equipmentService.saveImg(equipment);
      }

      System.out.println(equipment.getDeptId());
      return R.status(equipmentService.saveOrUpdate(equipment));
   }

   /**
    * 删除
    */
   @PostMapping("/remove")