From 4e48664942bbefe70699ca43d25cbbd56ecc8daa Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Mon, 19 Jan 2026 15:17:12 +0800
Subject: [PATCH] update-维修计划状态更新、新增定时器修改状态
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java
index e4336d9..49ad369 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java
@@ -21,15 +21,19 @@
import org.sxkj.fw.device.dto.FwDeviceDTO;
import org.sxkj.fw.device.entity.FwDeviceEntity;
import org.sxkj.fw.device.vo.CockpitFwDeviceVO;
+import org.sxkj.fw.device.vo.DeviceTypeStatisticsVO;
import org.sxkj.fw.device.vo.FwDeviceVO;
import org.sxkj.fw.device.excel.FwDeviceExcel;
import org.sxkj.fw.device.mapper.FwDeviceMapper;
import org.sxkj.fw.device.service.IFwDeviceService;
+import org.sxkj.fw.area.service.IFwAreaDivideService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import java.util.List;
+import java.util.Map;
+import javax.annotation.Resource;
/**
* 设备表 服务实现类
@@ -40,14 +44,17 @@
@Service
public class FwDeviceServiceImpl extends BaseServiceImpl<FwDeviceMapper, FwDeviceEntity> implements IFwDeviceService {
+ @Resource
+ private IFwAreaDivideService fwAreaDivideService;
+
@Override
public IPage<FwDeviceEntity> selectFwDevicePage(IPage<FwDeviceEntity> page, FwDeviceDTO fwDevice) {
return page.setRecords(baseMapper.selectFwDevicePage(page, fwDevice));
}
@Override
- public List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect) {
- return baseMapper.selectFwDeviceList(isAreaSelect);
+ public List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId, Integer status) {
+ return baseMapper.selectFwDeviceList(isAreaSelect, areaId, status);
}
@@ -81,6 +88,25 @@
}
/**
+ * 设备统计 - 按类型统计
+ * @return 统计数据
+ */
+ @Override
+ public List<DeviceTypeStatisticsVO> getDeviceTypeStatistics() {
+ return baseMapper.getDeviceTypeStatistics();
+ }
+
+ @Override
+ public List<DeviceStatisticsVO> getDeviceOutStatistics() {
+ return baseMapper.getDeviceOutStatistics();
+ }
+
+ @Override
+ public List<DeviceStatisticsVO> getDeviceManufacturerStatistics() {
+ return baseMapper.getDeviceManufacturerStatistics();
+ }
+
+ /**
* 设备属性统计
* @return
*/
@@ -88,4 +114,9 @@
public AlarmStatisticsVO statisticalDeviceAtt() {
return baseMapper.statisticalDeviceAtt();
}
+
+ @Override
+ public Map<Long, String> selectSceneNameByDeviceIds(List<Long> deviceIds) {
+ return fwAreaDivideService.selectSceneNameByDeviceIds(deviceIds);
+ }
}
--
Gitblit v1.9.3