From 7bf05b3448140adabf70794f683c7f352a29d83b Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Fri, 16 Jan 2026 11:15:16 +0800
Subject: [PATCH] 反无大屏设备相关优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/controller/FwDeviceConfigController.java | 64 +++++++++++++++++++-------------
1 files changed, 38 insertions(+), 26 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/controller/FwDeviceConfigController.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/controller/FwDeviceConfigController.java
index 0991a64..ed96216 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/controller/FwDeviceConfigController.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/controller/FwDeviceConfigController.java
@@ -21,6 +21,7 @@
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
+
import javax.validation.Valid;
import org.springblade.core.secure.BladeUser;
@@ -41,6 +42,7 @@
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import springfox.documentation.annotations.ApiIgnore;
+
import java.util.Map;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
@@ -49,7 +51,7 @@
* 设备配置表 控制器
*
* @author lw
- * @since 2026-01-07
+ * @since 2026-01-08
*/
@RestController
@AllArgsConstructor
@@ -64,17 +66,27 @@
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
- @ApiOperation(value = "详情", notes = "传入fwDeviceConfig")
- public R<FwDeviceConfigVO> detail(FwDeviceConfigEntity fwDeviceConfig) {
- FwDeviceConfigEntity detail = fwDeviceConfigService.getOne(Condition.getQueryWrapper(fwDeviceConfig));
+ @ApiOperation(value = "详情", notes = "传入deviceId")
+ public R detail(@ApiParam(value = "设备id", required = true) @RequestParam Long deviceId) {
+ if (deviceId == null) {
+ return R.fail("设备id不能为空");
+ }
+ FwDeviceConfigEntity detail = fwDeviceConfigService.selectLatestByDeviceId(deviceId);
+ if (detail == null) {
+ detail = fwDeviceConfigService.selectLatestVersionByDeviceId(deviceId);
+ }
+ if (detail == null) {
+ return R.data("");
+ }
return R.data(FwDeviceConfigWrapper.build().entityVO(detail));
}
+
/**
* 设备配置表 分页
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
- @ApiOperation(value = "分页", notes = "传入fwDeviceConfig")
+ @ApiOperation(value = "列表", notes = "传入fwDeviceConfig")
public R<IPage<FwDeviceConfigVO>> list(@ApiIgnore @RequestParam Map<String, Object> fwDeviceConfig, Query query) {
IPage<FwDeviceConfigEntity> pages = fwDeviceConfigService.page(Condition.getPage(query), Condition.getQueryWrapper(fwDeviceConfig, FwDeviceConfigEntity.class));
return R.data(FwDeviceConfigWrapper.build().pageVO(pages));
@@ -90,26 +102,26 @@
IPage<FwDeviceConfigVO> pages = fwDeviceConfigService.selectFwDeviceConfigPage(Condition.getPage(query), fwDeviceConfig);
return R.data(pages);
}
-
- /**
- * 设备配置表 新增
- */
- @PostMapping("/save")
- @ApiOperationSupport(order = 4)
- @ApiOperation(value = "新增", notes = "传入fwDeviceConfig")
- public R save(@Valid @RequestBody FwDeviceConfigEntity fwDeviceConfig) {
- return R.status(fwDeviceConfigService.save(fwDeviceConfig));
- }
-
- /**
- * 设备配置表 修改
- */
- @PostMapping("/update")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "修改", notes = "传入fwDeviceConfig")
- public R update(@Valid @RequestBody FwDeviceConfigEntity fwDeviceConfig) {
- return R.status(fwDeviceConfigService.updateById(fwDeviceConfig));
- }
+//
+// /**
+// * 设备配置表 新增
+// */
+// @PostMapping("/save")
+// @ApiOperationSupport(order = 4)
+// @ApiOperation(value = "新增", notes = "传入fwDeviceConfig")
+// public R save(@Valid @RequestBody FwDeviceConfigEntity fwDeviceConfig) {
+// return saveOrUpdateConfig(fwDeviceConfig);
+// }
+//
+// /**
+// * 设备配置表 修改
+// */
+// @PostMapping("/update")
+// @ApiOperationSupport(order = 5)
+// @ApiOperation(value = "修改", notes = "传入fwDeviceConfig")
+// public R update(@Valid @RequestBody FwDeviceConfigEntity fwDeviceConfig) {
+// return saveOrUpdateConfig(fwDeviceConfig);
+// }
/**
* 设备配置表 新增或修改
@@ -118,7 +130,7 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入fwDeviceConfig")
public R submit(@Valid @RequestBody FwDeviceConfigEntity fwDeviceConfig) {
- return R.status(fwDeviceConfigService.saveOrUpdate(fwDeviceConfig));
+ return fwDeviceConfigService.saveOrUpdateConfig(fwDeviceConfig);
}
/**
--
Gitblit v1.9.3