From afbfcf1e3ba9d232c0ce8db6130c6a0035df8001 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 26 Jan 2026 19:31:14 +0800
Subject: [PATCH] 设备范围为0，经纬度置空
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 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 fe48dc0..6fd4899 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;
@@ -32,7 +30,6 @@
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.*;
import org.sxkj.fw.cockpit.vo.DeviceStatisticsVO;
import org.sxkj.fw.common.GenericConverter;
@@ -104,21 +101,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));
- IPage<FwDeviceVO> result = FwDeviceWrapper.build().pageVO(pages);
- List<FwDeviceVO> records = result.getRecords();
- if (records != null && !records.isEmpty()) {
- List<Long> deviceIds = records.stream()
- .map(FwDeviceVO::getId)
- .filter(id -> id != null)
- .collect(Collectors.toList());
- Map<Long, String> sceneNameMap = fwDeviceService.selectSceneNameByDeviceIds(deviceIds);
- for (FwDeviceVO record : records) {
- String sceneName = sceneNameMap.get(record.getId());
- record.setSceneName(StringUtil.isBlank(sceneName) ? "/" : sceneName);
- }
- }
- return R.data(result);
+ return R.data(fwDeviceService.selectFwDevicePageVo(fwDevice, query));
}
/**
@@ -128,7 +111,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)));
}
/**
@@ -153,14 +136,17 @@
}
/**
- * 设备类型统计
+ * 设备出库去向统计
* @return 统计数据
*/
@GetMapping("/statisticalDeviceOut")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "设备出库去向统计", notes = "设备出库去向统计")
- public R<List<DeviceStatisticsVO>> statisticalDeviceOut() {
- return R.data(fwDeviceService.getDeviceOutStatistics());
+ @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));
}
/**
@@ -175,6 +161,20 @@
}
/**
+ * 设备区域绑定校验
+ */
+ @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")
--
Gitblit v1.9.3