From 5b6e4a9e17e2425b43e3a6957115366e84ba8ce5 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 06 Apr 2021 14:30:34 +0800
Subject: [PATCH] 1.监控台接口 2.客户管理
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
index 8aff20b..a0b40c0 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
@@ -63,15 +63,15 @@
@Override
- public IPage<EquipmentVO> selectDeptPages(IPage<EquipmentVO> page, EquipmentVO equipment,String pid) {
+ public IPage<EquipmentVO> selectDeptPages(IPage<EquipmentVO> page, EquipmentVO equipment,String pid,String dxdype) {
List deptIdList;
- if (!pid.equals("")){
+ if (pid != null && !pid.equals("")){
deptIdList = SysCache.getDeptChildIds(Long.valueOf(pid));
}else{
deptIdList = SysCache.getDeptChildIds(null);
}
- return page.setRecords(baseMapper.selectDeptPages(page,equipment,deptIdList));
+ return page.setRecords(baseMapper.selectDeptPages(page,equipment,deptIdList,dxdype));
}
@@ -180,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();
+ }
}
--
Gitblit v1.9.3