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

tangzy

2021-04-25 a4ff2b571be305e2641c9dd67797f4102e795ebb

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java

@@ -83,13 +83,18 @@
   }

   @Override
   public List<EquipmentVO> listAll() {
      return baseMapper.listAll();
   public List<EquipmentVO> listAll(EquipmentVO equipment) {
      return baseMapper.listAll(equipment);
   }

   @Override
   public void updateOne(Equipment equipment) {
      baseMapper.updateOne(equipment);
   }

   @Override
   public void saveImg(EquipmentVO equipment) {
      baseMapper.saveImg(equipment);
   }

   @Override
@@ -148,7 +153,7 @@
   @Override
   public Integer selectEquipmentCount(ConditionVo conditionVo) {
      //先查询所有的设备
      List<EquipmentVO> equipmentVOS = baseMapper.listAll();
      List<EquipmentVO> equipmentVOS = baseMapper.listAlls();
      long time = new Date().getTime();
      int equipmentCount = 0;
      long hearbeat = 0;