南昌市物联网技防平台-后台
zengh
2021-03-10 fa9ffa9012d7b1df7692bb99e71be6592f48cd4b
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
@@ -17,9 +17,11 @@
package org.springblade.jfpt.equipment.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.tool.node.ForestNodeMerger;
import org.springblade.core.tool.utils.Func;
import org.springblade.jfpt.alarm.vo.AlarmVO;
import org.springblade.jfpt.equipment.entity.Equipment;
import org.springblade.jfpt.equipment.mapper.EquipmentMapper;
import org.springblade.jfpt.equipment.service.IEquipmentService;
@@ -41,11 +43,15 @@
   private static final String PARENT_ID = "parentId";
   @Override
   public List<EquipmentVO> selectEquipmentPage(String deviceName, String addvcd, String dtype, String devicestate) {
      return baseMapper.selectEquipmentPage(deviceName,addvcd,dtype,devicestate);
   public IPage<EquipmentVO> selectEquipmentPage(IPage<EquipmentVO> page, EquipmentVO equipment,List childList) {
      return page.setRecords(baseMapper.selectEquipmentPage(page,equipment,childList));
   }
   @Override
   public IPage<EquipmentVO> selectPage(IPage<EquipmentVO> page, EquipmentVO equipment,String pid) {
      return page.setRecords(baseMapper.selectEquipmentPage(page,equipment,null));
   }
   @Override
   public List<EquipmentVOS> tree() {
@@ -53,6 +59,11 @@
   }
   @Override
   public List<EquipmentVO> listAll() {
      return baseMapper.listAll();
   }
   @Override
   public void updateOne(Equipment equipment) {
      baseMapper.updateOne(equipment);
   }