From c04afebf9cebfd65bf55c2395e732f36f558d208 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 28 Jan 2026 10:30:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java | 70 ++++++++++++++++++++++++++++++-----
1 files changed, 60 insertions(+), 10 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 c7e0baa..085d7cb 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
@@ -19,9 +19,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.*;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
@@ -33,6 +31,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 +39,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;
@@ -85,10 +85,12 @@
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
- @ApiOperation(value = "列表", notes = "传入isAreaSelect和区域id")
+ @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) {
- List<FwDeviceEntity> list = fwDeviceService.selectFwDeviceList(isAreaSelect, areaId);
+ @RequestParam(value = "areaId", required = false) Long areaId,
+ @RequestParam(value = "status", required = false) Integer status,
+ @RequestParam(value = "isTrack", required = false) Integer isTrack) {
+ List<FwDeviceEntity> list = fwDeviceService.selectFwDeviceList(isAreaSelect, areaId, status, isTrack);
FwDeviceWrapper wrapper = FwDeviceWrapper.build();
return R.data(list.stream().map(wrapper::entityVO).collect(Collectors.toList()));
}
@@ -100,8 +102,7 @@
@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));
}
/**
@@ -111,7 +112,7 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增或修改", notes = "传入fwDevice")
public R submit(@Valid @RequestBody FwDeviceDTO fwDevice) {
- return R.status(fwDeviceService.saveOrUpdate(FwDeviceWrapper.build().entityDTO(fwDevice)));
+ return R.status(fwDeviceService.saveOrUpdateDevice(FwDeviceWrapper.build().entityDTO(fwDevice)));
}
/**
@@ -124,12 +125,61 @@
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 = "设备出库去向统计")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "effectiveRangeKmIsNotNull", value = "有效范围是否为空：0-不处理 1-不为空 2-为空", paramType = "query", dataType = "string")
+ })
+ public R<List<DeviceStatisticsVO>> statisticalDeviceOut(String effectiveRangeKmIsNotNull) {
+ return R.data(fwDeviceService.getDeviceOutStatistics(effectiveRangeKmIsNotNull));
+ }
+
+ /**
+ * 设备生产厂商统计
+ * @return 统计数据
+ */
+ @GetMapping("/statisticalDeviceManufacturer")
+ @ApiOperationSupport(order = 8)
+ @ApiOperation(value = "设备生产厂商统计", notes = "设备生产厂商统计")
+ public R<List<DeviceStatisticsVO>> statisticalDeviceManufacturer() {
+ return R.data(fwDeviceService.getDeviceManufacturerStatistics());
+ }
+
+ /**
+ * 设备区域绑定校验
+ */
+ @GetMapping("/checkAreaBind")
+ @ApiOperationSupport(order = 9)
+ @ApiOperation(value = "设备区域绑定校验", notes = "传入deviceId")
+ public R<Boolean> checkAreaBind(@ApiParam(value = "设备ID", required = true) @RequestParam Long deviceId) {
+ FwDeviceEntity device = fwDeviceService.getById(deviceId);
+ if (device == null || (device.getIsDeleted() != null && device.getIsDeleted() != 0)) {
+ return R.fail("该设备不存在");
+ }
+ return R.data(fwDeviceService.existsAreaBindByDeviceId(deviceId));
+ }
/**
* 导出数据
*/
@GetMapping("/export-fwDevice")
- @ApiOperationSupport(order = 6)
+ @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