From 70464cc66f77cf847464ffe71f2fd456ee11b0fb Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 08 Jan 2026 19:02:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java | 107 +++++++++++++++++++++--------------------------------
1 files changed, 42 insertions(+), 65 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 55bfd74..7d65a57 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
@@ -16,116 +16,92 @@
*/
package org.sxkj.fw.device.controller;
+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 com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.constant.BladeConstant;
+import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.sxkj.fw.device.dto.FwDeviceDTO;
import org.sxkj.fw.device.entity.FwDeviceEntity;
-import org.sxkj.fw.device.vo.FwDeviceVO;
import org.sxkj.fw.device.excel.FwDeviceExcel;
-import org.sxkj.fw.device.wrapper.FwDeviceWrapper;
import org.sxkj.fw.device.service.IFwDeviceService;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.excel.util.ExcelUtil;
-import org.springblade.core.tool.constant.BladeConstant;
+import org.sxkj.fw.device.vo.FwDeviceVO;
+import org.sxkj.fw.device.wrapper.FwDeviceWrapper;
import springfox.documentation.annotations.ApiIgnore;
-import java.util.Map;
-import java.util.List;
+
import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
/**
- * 反无设备表 控制器
+ * 设备表 控制器
*
- * @author AIX
- * @since 2026-01-06
+ * @author aix
+ * @since 2026-01-08
*/
@RestController
@AllArgsConstructor
-@RequestMapping("fwDevice/fwDevice")
-@Api(value = "反无设备表", tags = "反无设备表接口")
+@RequestMapping("device/fwDevice")
+@Api(value = "设备表", tags = "设备表接口")
public class FwDeviceController extends BladeController {
private final IFwDeviceService fwDeviceService;
/**
- * 反无设备表 详情
+ * 设备表 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入fwDevice")
- public R<FwDeviceVO> detail(FwDeviceEntity fwDevice) {
- FwDeviceEntity detail = fwDeviceService.getOne(Condition.getQueryWrapper(fwDevice));
+ public R<FwDeviceVO> detail(FwDeviceDTO fwDevice) {
+ FwDeviceEntity detail = fwDeviceService.getOne(Condition.getQueryWrapper(FwDeviceWrapper.build().entityDTO(fwDevice)));
+
+ if (detail == null) {
+ return R.fail("该设备不存在");
+ }
+
return R.data(FwDeviceWrapper.build().entityVO(detail));
}
+
/**
- * 反无设备表 分页
+ * 设备表 自定义分页
*/
- @GetMapping("/list")
+ @GetMapping("/page")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入fwDevice")
- public R<IPage<FwDeviceVO>> list(@ApiIgnore @RequestParam Map<String, Object> fwDevice, Query query) {
- IPage<FwDeviceEntity> pages = fwDeviceService.page(Condition.getPage(query), Condition.getQueryWrapper(fwDevice, FwDeviceEntity.class));
+ public R<IPage<FwDeviceVO>> page(FwDeviceDTO fwDevice, Query query) {
+ IPage<FwDeviceEntity> pages = fwDeviceService.selectFwDevicePage(Condition.getPage(query), fwDevice);
return R.data(FwDeviceWrapper.build().pageVO(pages));
}
/**
- * 反无设备表 自定义分页
- */
- @GetMapping("/page")
- @ApiOperationSupport(order = 3)
- @ApiOperation(value = "分页", notes = "传入fwDevice")
- public R<IPage<FwDeviceVO>> page(FwDeviceVO fwDevice, Query query) {
- IPage<FwDeviceVO> pages = fwDeviceService.selectFwDevicePage(Condition.getPage(query), fwDevice);
- return R.data(pages);
- }
-
- /**
- * 反无设备表 新增
- */
- @PostMapping("/save")
- @ApiOperationSupport(order = 4)
- @ApiOperation(value = "新增", notes = "传入fwDevice")
- public R save(@Valid @RequestBody FwDeviceEntity fwDevice) {
- return R.status(fwDeviceService.save(fwDevice));
- }
-
- /**
- * 反无设备表 修改
- */
- @PostMapping("/update")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "修改", notes = "传入fwDevice")
- public R update(@Valid @RequestBody FwDeviceEntity fwDevice) {
- return R.status(fwDeviceService.updateById(fwDevice));
- }
-
- /**
- * 反无设备表 新增或修改
+ * 设备表 新增或修改
*/
@PostMapping("/submit")
- @ApiOperationSupport(order = 6)
+ @ApiOperationSupport(order = 3)
@ApiOperation(value = "新增或修改", notes = "传入fwDevice")
- public R submit(@Valid @RequestBody FwDeviceEntity fwDevice) {
- return R.status(fwDeviceService.saveOrUpdate(fwDevice));
+ public R submit(@Valid @RequestBody FwDeviceDTO fwDevice) {
+ return R.status(fwDeviceService.saveOrUpdate(FwDeviceWrapper.build().entityDTO(fwDevice)));
}
/**
- * 反无设备表 删除
+ * 设备表 删除
*/
@PostMapping("/remove")
- @ApiOperationSupport(order = 7)
+ @ApiOperationSupport(order = 4)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(fwDeviceService.deleteLogic(Func.toLongList(ids)));
@@ -136,8 +112,9 @@
* 导出数据
*/
@GetMapping("/export-fwDevice")
- @ApiOperationSupport(order = 9)
+ @ApiOperationSupport(order = 5)
@ApiOperation(value = "导出数据", notes = "传入fwDevice")
+ @ApiIgnore
public void exportFwDevice(@ApiIgnore @RequestParam Map<String, Object> fwDevice, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<FwDeviceEntity> queryWrapper = Condition.getQueryWrapper(fwDevice, FwDeviceEntity.class);
//if (!AuthUtil.isAdministrator()) {
@@ -145,7 +122,7 @@
//}
queryWrapper.lambda().eq(FwDeviceEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<FwDeviceExcel> list = fwDeviceService.exportFwDevice(queryWrapper);
- ExcelUtil.export(response, "反无设备表数据" + DateUtil.time(), "反无设备表数据表", list, FwDeviceExcel.class);
+ ExcelUtil.export(response, "设备表数据" + DateUtil.time(), "设备表数据表", list, FwDeviceExcel.class);
}
}
--
Gitblit v1.9.3