Merge remote-tracking branch 'origin/master'

zengh

2021-04-06 d7dd6cbbad5213476bd1e98d65fee6056ad4c2fc

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

@@ -27,6 +27,7 @@
import org.springblade.jfpt.equipment.service.IEquipmentService;
import org.springblade.jfpt.equipment.vo.EquipmentVO;
import org.springblade.jfpt.equipment.vo.EquipmentVOS;
import org.springblade.system.cache.SysCache;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;

@@ -59,6 +60,21 @@

      return page.setRecords(baseMapper.selectEquipmentPage(page,equipment,null));
   }


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



   @Override
   public List<EquipmentVOS> tree() {
@@ -164,4 +180,24 @@
   public void updateExstate(String state, String reason, String deviceNumber) {
      baseMapper.updateExstate(state, reason, deviceNumber);
   }

   @Override
   public Integer selectEqCz() {
      return baseMapper.selectEqCz();
   }

   @Override
   public Integer selectEqCd() {
      return baseMapper.selectEqCd();
   }

   @Override
   public List<Map<String, Object>> selectEqCy(String time) {
      return baseMapper.selectEqCy(time);
   }

   @Override
   public Integer selectEqCg() {
      return baseMapper.selectEqCg();
   }
}