From 8fe759f26e23fb594f4bf02d6d4889f4521d41a7 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Sat, 11 Oct 2025 15:26:43 +0800
Subject: [PATCH] 1.修该并合并无人机盒子对象相关关系。
---
ard-admin/src/main/java/com/ard/web/controller/work/uav/UavBoxController.java | 42 +++++++++++++++++++-----------------------
1 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/work/uav/UavBoxController.java b/ard-admin/src/main/java/com/ard/web/controller/work/uav/UavBoxController.java
index 880f5fb..4c4718f 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/work/uav/UavBoxController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/work/uav/UavBoxController.java
@@ -4,8 +4,8 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
-import com.ard.work.domain.entity.UavBoxEntity;
-import com.ard.work.service.IUavBoxService;
+import com.ard.work.domain.entity.ArdDroneInfo;
+import com.ard.work.service.IArdDroneService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -33,10 +33,10 @@
@Api(tags = "无人机盒子")
@RestController
@RequestMapping("/uav/box")
-public class UavBoxController extends BaseController
-{
+public class UavBoxController extends BaseController {
+
@Resource
- private IUavBoxService uavBoxService;
+ private IArdDroneService ardDroneService;
/**
* 查询无人机盒子列表
@@ -44,10 +44,10 @@
@ApiOperation("查询无人机盒子列表")
@PreAuthorize("@ss.hasPermi('uav:box:list')")
@GetMapping("/list")
- public TableDataInfo list(UavBoxEntity uavBoxEntity)
+ public TableDataInfo list(ArdDroneInfo ArdDroneInfo)
{
startPage();
- List<UavBoxEntity> list = uavBoxService.selectUavBoxList(uavBoxEntity);
+ List<ArdDroneInfo> list = ardDroneService.selectArdDroneList(ArdDroneInfo);
return getDataTable(list);
}
@@ -57,10 +57,9 @@
@PreAuthorize("@ss.hasPermi('uav:box:export')")
@Log(title = "无人机盒子", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, UavBoxEntity uavBoxEntity)
- {
- List<UavBoxEntity> list = uavBoxService.selectUavBoxList(uavBoxEntity);
- ExcelUtil<UavBoxEntity> util = new ExcelUtil<UavBoxEntity>(UavBoxEntity.class);
+ public void export(HttpServletResponse response, ArdDroneInfo ArdDroneInfo) {
+ List<ArdDroneInfo> list = ardDroneService.selectArdDroneList(ArdDroneInfo);
+ ExcelUtil<ArdDroneInfo> util = new ExcelUtil<ArdDroneInfo>(ArdDroneInfo.class);
util.exportExcel(response, list, "无人机盒子数据");
}
@@ -70,9 +69,8 @@
@ApiOperation("获取无人机盒子详细信息")
@PreAuthorize("@ss.hasPermi('uav:box:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
- return success(uavBoxService.selectUavBoxById(id));
+ public AjaxResult getInfo(@PathVariable("id") String id) {
+ return success(ardDroneService.selectArdDroneById(id));
}
/**
@@ -82,9 +80,8 @@
@PreAuthorize("@ss.hasPermi('uav:box:add')")
@Log(title = "无人机盒子", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody UavBoxEntity uavBoxEntity)
- {
- return toAjax(uavBoxService.insertUavBox(uavBoxEntity));
+ public AjaxResult add(@RequestBody ArdDroneInfo ardDroneInfo) {
+ return toAjax(ardDroneService.insertArdDrone(ardDroneInfo));
}
/**
@@ -94,9 +91,8 @@
@PreAuthorize("@ss.hasPermi('uav:box:edit')")
@Log(title = "无人机盒子", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody UavBoxEntity uavBoxEntity)
- {
- return toAjax(uavBoxService.updateUavBox(uavBoxEntity));
+ public AjaxResult edit(@RequestBody ArdDroneInfo ArdDroneInfo) {
+ return toAjax(ardDroneService.updateArdDrone(ArdDroneInfo));
}
/**
@@ -106,8 +102,8 @@
@PreAuthorize("@ss.hasPermi('uav:box:remove')")
@Log(title = "无人机盒子", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
- return toAjax(uavBoxService.deleteUavBoxByIds(ids));
+ public AjaxResult remove(@PathVariable String[] ids) {
+ return toAjax(ardDroneService.deleteArdDroneByIds(ids));
}
+
}
--
Gitblit v1.9.3