From 1510366fa12fafd5197ebcd8d7fbc45d2383218d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 22 Jan 2026 15:49:27 +0800
Subject: [PATCH] 设备管理优化
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdManageDeviceController.java | 76 ++++++++++++++++----------------------
1 files changed, 32 insertions(+), 44 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdManageDeviceController.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdManageDeviceController.java
index a3cc6de..6a6b3a6 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdManageDeviceController.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdManageDeviceController.java
@@ -16,34 +16,37 @@
*/
package org.sxkj.gd.workorder.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.gd.common.GenericConverter;
+import org.sxkj.gd.common.IdParam;
+import org.sxkj.gd.workorder.dto.GdManageDeviceDTO;
import org.sxkj.gd.workorder.entity.GdManageDeviceEntity;
-import org.sxkj.gd.workorder.vo.GdManageDeviceVO;
import org.sxkj.gd.workorder.excel.GdManageDeviceExcel;
-import org.sxkj.gd.workorder.wrapper.GdManageDeviceWrapper;
import org.sxkj.gd.workorder.service.IGdManageDeviceService;
-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.gd.workorder.vo.GdManageDeviceVO;
+import org.sxkj.gd.workorder.wrapper.GdManageDeviceWrapper;
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;
/**
* 设备信息 控制器
@@ -65,19 +68,23 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入gdManageDevice")
- public R<GdManageDeviceVO> detail(GdManageDeviceEntity gdManageDevice) {
- GdManageDeviceEntity detail = gdManageDeviceService.getOne(Condition.getQueryWrapper(gdManageDevice));
+ public R<GdManageDeviceVO> detail(@Valid IdParam manageDevice) {
+ GdManageDeviceEntity detail = gdManageDeviceService.getOne(Condition.getQueryWrapper(GenericConverter.convert(manageDevice, GdManageDeviceEntity.class)));
+ if (detail == null) {
+ return R.fail("该设备不存在");
+ }
return R.data(GdManageDeviceWrapper.build().entityVO(detail));
}
+
/**
- * 设备信息 分页
+ * 设备信息 自定义分页
*/
@GetMapping("/list")
- @ApiOperationSupport(order = 2)
- @ApiOperation(value = "分页", notes = "传入gdManageDevice")
- public R<IPage<GdManageDeviceVO>> list(@ApiIgnore @RequestParam Map<String, Object> gdManageDevice, Query query) {
- IPage<GdManageDeviceEntity> pages = gdManageDeviceService.page(Condition.getPage(query), Condition.getQueryWrapper(gdManageDevice, GdManageDeviceEntity.class));
- return R.data(GdManageDeviceWrapper.build().pageVO(pages));
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "不分页", notes = "传入gdManageDevice")
+ public R<List<GdManageDeviceVO>> page(GdManageDeviceVO gdManageDevice) {
+ List<GdManageDeviceVO> pages = gdManageDeviceService.selectGdManageDevice(gdManageDevice);
+ return R.data(pages);
}
/**
@@ -92,33 +99,13 @@
}
/**
- * 设备信息 新增
- */
- @PostMapping("/save")
- @ApiOperationSupport(order = 4)
- @ApiOperation(value = "新增", notes = "传入gdManageDevice")
- public R save(@Valid @RequestBody GdManageDeviceEntity gdManageDevice) {
- return R.status(gdManageDeviceService.save(gdManageDevice));
- }
-
- /**
- * 设备信息 修改
- */
- @PostMapping("/update")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "修改", notes = "传入gdManageDevice")
- public R update(@Valid @RequestBody GdManageDeviceEntity gdManageDevice) {
- return R.status(gdManageDeviceService.updateById(gdManageDevice));
- }
-
- /**
* 设备信息 新增或修改
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入gdManageDevice")
- public R submit(@Valid @RequestBody GdManageDeviceEntity gdManageDevice) {
- return R.status(gdManageDeviceService.saveOrUpdate(gdManageDevice));
+ public R submit(@Valid @RequestBody GdManageDeviceDTO gdManageDevice) throws Exception {
+ return R.status(gdManageDeviceService.saveOrUpdateDevice(GdManageDeviceWrapper.build().entityDTO(gdManageDevice)));
}
/**
@@ -137,6 +124,7 @@
*/
@GetMapping("/export-gdManageDevice")
@ApiOperationSupport(order = 9)
+ @ApiIgnore
@ApiOperation(value = "导出数据", notes = "传入gdManageDevice")
public void exportGdManageDevice(@ApiIgnore @RequestParam Map<String, Object> gdManageDevice, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<GdManageDeviceEntity> queryWrapper = Condition.getQueryWrapper(gdManageDevice, GdManageDeviceEntity.class);
--
Gitblit v1.9.3