dyf/fys-Multi-tenant
1
0
Fork 2
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

首页数据

Browse Source
This commit is contained in:
daiyongfei
2025-09-02 15:08:53 +08:00
parent 98ef841f18
commit 1d37bfb719
9 changed files with 237 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceService.java
View File

@ -9,12 +9,11 @@ import com.fuyuanshen.equipment.domain.Device;
import com.fuyuanshen.equipment.domain.dto.AppDeviceBo;
import com.fuyuanshen.equipment.domain.form.DeviceForm;
import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
import com.fuyuanshen.equipment.domain.vo.CustomerVo;
import com.fuyuanshen.equipment.domain.vo.DataOverviewVo;
import com.fuyuanshen.equipment.domain.vo.*;
import java.io.IOException;
import java.util.List;
import java.util.Map;
/**
* @Description:
@ -122,4 +121,27 @@ public interface DeviceService extends IService<Device> {
* @return
*/
DataOverviewVo getDataOverview();
/**
* 获取设备分类
*
* @return
*/
EquipmentClassificationVo getEquipmentClassification();
/**
* 获取告警信息
*
* @return
*/
AlarmInformationVo getAlarmInformation();
/**
* 获取设备使用数据
*
* @param deviceId
* @param range
* @return
*/
List<Map<String, Object>> getEquipmentUsageData(Long deviceId, Integer range);
}

53
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java
View File

@ -28,9 +28,7 @@ import com.fuyuanshen.equipment.domain.form.DeviceForm;
import com.fuyuanshen.equipment.domain.query.DeviceAssignmentQuery;
import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
import com.fuyuanshen.equipment.domain.query.DeviceTypeQueryCriteria;
import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
import com.fuyuanshen.equipment.domain.vo.CustomerVo;
import com.fuyuanshen.equipment.domain.vo.DataOverviewVo;
import com.fuyuanshen.equipment.domain.vo.*;
import com.fuyuanshen.equipment.enums.BindingStatusEnum;
import com.fuyuanshen.equipment.enums.CommunicationModeEnum;
import com.fuyuanshen.equipment.enums.DeviceActiveStatusEnum;
@ -53,11 +51,9 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.io.IOException;
import java.sql.Timestamp;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.*;
/**
* @Description:
@ -596,8 +592,6 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
}
/**
* 查询设备MAC号
*
@ -623,7 +617,46 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
*/
@Override
public DataOverviewVo getDataOverview() {
return null;
DataOverviewVo dataOverviewVo = deviceMapper.getDataOverview();
return dataOverviewVo;
}
/**
* 获取设备分类
*
* @return
*/
@Override
public EquipmentClassificationVo getEquipmentClassification() {
EquipmentClassificationVo equipmentClassification = deviceMapper.getEquipmentClassification();
return equipmentClassification;
}
/**
* 获取告警信息
*
* @return
*/
@Override
public AlarmInformationVo getAlarmInformation() {
AlarmInformationVo alarmInformation = deviceMapper.getAlarmInformation();
return alarmInformation;
}
/**
* 获取设备使用数据
*
* @param deviceId 设备ID
* @param range 时间范围 1:半年 2:一年
* @return 每月使用数据列表
*/
@Override
public List<Map<String, Object>> getEquipmentUsageData(Long deviceId, Integer range) {
List<Map<String, Object>> equipmentUsageData = deviceMapper.getEquipmentUsageData(deviceId, range);
return equipmentUsageData;
}
}