From 23e1f1330b144f63780c1a5d438e2b3c53be2d7f Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 21 Jan 2026 12:42:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 6 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java
index f1a61bb..d83521d 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java
@@ -33,6 +33,7 @@
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
+import org.sxkj.fw.cockpit.vo.DeviceStatisticsVO;
import org.sxkj.fw.common.GenericConverter;
import org.sxkj.fw.common.IdParam;
import org.sxkj.fw.device.dto.FwDeviceDTO;
@@ -40,6 +41,7 @@
import org.sxkj.fw.device.excel.FwDeviceExcel;
import org.sxkj.fw.device.param.FwDevicePageParam;
import org.sxkj.fw.device.service.IFwDeviceService;
+import org.sxkj.fw.device.vo.DeviceTypeStatisticsVO;
import org.sxkj.fw.device.vo.FwDeviceVO;
import org.sxkj.fw.device.wrapper.FwDeviceWrapper;
import springfox.documentation.annotations.ApiIgnore;
@@ -48,6 +50,7 @@
import javax.validation.Valid;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* 设备表 控制器
@@ -80,21 +83,34 @@
}
/**
+ * 设备表 列表
+ */
+ @GetMapping("/list")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "列表", notes = "传入isAreaSelect、areaId、status")
+ public R<List<FwDeviceVO>> list(@RequestParam(value = "isAreaSelect", required = false) Integer isAreaSelect,
+ @RequestParam(value = "areaId", required = false) Long areaId,
+ @RequestParam(value = "status", required = false) Integer status) {
+ List<FwDeviceEntity> list = fwDeviceService.selectFwDeviceList(isAreaSelect, areaId, status);
+ FwDeviceWrapper wrapper = FwDeviceWrapper.build();
+ return R.data(list.stream().map(wrapper::entityVO).collect(Collectors.toList()));
+ }
+
+ /**
* 设备表 自定义分页
*/
@GetMapping("/page")
- @ApiOperationSupport(order = 2)
+ @ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入fwDevice")
public R<IPage<FwDeviceVO>> page(FwDevicePageParam fwDevice, Query query) {
- IPage<FwDeviceEntity> pages = fwDeviceService.selectFwDevicePage(Condition.getPage(query), GenericConverter.convert(fwDevice, FwDeviceDTO.class));
- return R.data(FwDeviceWrapper.build().pageVO(pages));
+ return R.data(fwDeviceService.selectFwDevicePageVo(fwDevice, query));
}
/**
* 设备表 新增或修改
*/
@PostMapping("/submit")
- @ApiOperationSupport(order = 3)
+ @ApiOperationSupport(order = 4)
@ApiOperation(value = "新增或修改", notes = "传入fwDevice")
public R submit(@Valid @RequestBody FwDeviceDTO fwDevice) {
return R.status(fwDeviceService.saveOrUpdate(FwDeviceWrapper.build().entityDTO(fwDevice)));
@@ -104,18 +120,50 @@
* 设备表 删除
*/
@PostMapping("/remove")
- @ApiOperationSupport(order = 4)
+ @ApiOperationSupport(order = 5)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(fwDeviceService.deleteLogic(Func.toLongList(ids)));
}
+ /**
+ * 设备类型统计
+ * @return 统计数据
+ */
+ @GetMapping("/statisticalDeviceType")
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "设备类型统计", notes = "设备类型统计")
+ public R<List<DeviceTypeStatisticsVO>> statisticalDeviceType() {
+ return R.data(fwDeviceService.getDeviceTypeStatistics());
+ }
+
+ /**
+ * 设备类型统计
+ * @return 统计数据
+ */
+ @GetMapping("/statisticalDeviceOut")
+ @ApiOperationSupport(order = 7)
+ @ApiOperation(value = "设备出库去向统计", notes = "设备出库去向统计")
+ public R<List<DeviceStatisticsVO>> statisticalDeviceOut() {
+ return R.data(fwDeviceService.getDeviceOutStatistics());
+ }
+
+ /**
+ * 设备生产厂商统计
+ * @return 统计数据
+ */
+ @GetMapping("/statisticalDeviceManufacturer")
+ @ApiOperationSupport(order = 8)
+ @ApiOperation(value = "设备生产厂商统计", notes = "设备生产厂商统计")
+ public R<List<DeviceStatisticsVO>> statisticalDeviceManufacturer() {
+ return R.data(fwDeviceService.getDeviceManufacturerStatistics());
+ }
/**
* 导出数据
*/
@GetMapping("/export-fwDevice")
- @ApiOperationSupport(order = 5)
+ @ApiOperationSupport(order = 99)
@ApiOperation(value = "导出数据", notes = "传入fwDevice")
@ApiIgnore
public void exportFwDevice(@ApiIgnore @RequestParam Map<String, Object> fwDevice, BladeUser bladeUser, HttpServletResponse response) {
--
Gitblit v1.9.3