设备列表接口修改，根据部门id查询时修改为模糊查询

Administrator

2021-04-26 60f81ce58ccb481db36337dd744f15bd96f9141e

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

@@ -66,13 +66,13 @@
   @Override
   public IPage<EquipmentVO> selectDeptPages(IPage<EquipmentVO> page, EquipmentVO equipment,String pid,String dxdype) {

      List deptIdList;
      if (pid != null && !pid.equals("")){
         deptIdList = SysCache.getDeptChildIds(Long.valueOf(pid));
      }else{
         deptIdList = SysCache.getDeptChildIds(null);
      }
      return page.setRecords(baseMapper.selectDeptPages(page,equipment,deptIdList,dxdype));
//      List deptIdList;
//      if (pid != null && !pid.equals("")){
//         deptIdList = SysCache.getDeptChildIds(Long.valueOf(pid));
//      }else{
//         deptIdList = SysCache.getDeptChildIds(null);
//      }
      return page.setRecords(baseMapper.selectDeptPages(page,equipment,pid,dxdype));
   }


@@ -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;