From bbc3d8a4b43256e6cafefc7ab33f34e1459aed9b Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 09 Jan 2026 15:02:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceScrapController.java | 106 ++++++++++++++++++++---------------------------------
1 files changed, 40 insertions(+), 66 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceScrapController.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceScrapController.java
index 2cdfc9c..b3b63a6 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceScrapController.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceScrapController.java
@@ -16,34 +16,33 @@
*/
package org.sxkj.fw.device.controller;
-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.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.api.R;
-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.entity.FwDeviceScrapEntity;
-import org.sxkj.fw.device.vo.FwDeviceScrapVO;
-import org.sxkj.fw.device.excel.FwDeviceScrapExcel;
-import org.sxkj.fw.device.wrapper.FwDeviceScrapWrapper;
-import org.sxkj.fw.device.service.IFwDeviceScrapService;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
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.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.springframework.web.bind.annotation.*;
+import org.sxkj.fw.device.dto.FwDeviceScrapDTO;
+import org.sxkj.fw.device.entity.FwDeviceScrapEntity;
+import org.sxkj.fw.device.excel.FwDeviceScrapExcel;
+import org.sxkj.fw.device.service.IFwDeviceScrapService;
+import org.sxkj.fw.device.vo.FwDeviceScrapVO;
+import org.sxkj.fw.device.wrapper.FwDeviceScrapWrapper;
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 +64,19 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入fwDeviceScrap")
- public R<FwDeviceScrapVO> detail(FwDeviceScrapEntity fwDeviceScrap) {
- FwDeviceScrapEntity detail = fwDeviceScrapService.getOne(Condition.getQueryWrapper(fwDeviceScrap));
+ public R<FwDeviceScrapVO> detail(FwDeviceScrapDTO fwDeviceScrap) {
+
+ if (fwDeviceScrap.getId() == null) {
+ return R.fail("参数错误");
+ }
+
+ FwDeviceScrapEntity detail = fwDeviceScrapService.getOne(
+ Condition.getQueryWrapper(
+ FwDeviceScrapWrapper.build().entityDTO(fwDeviceScrap)));
+ if (detail == null) {
+ return R.fail("数据不存在");
+ }
return R.data(FwDeviceScrapWrapper.build().entityVO(detail));
- }
- /**
- * 设备报废记录表 分页
- */
- @GetMapping("/list")
- @ApiOperationSupport(order = 2)
- @ApiOperation(value = "分页", notes = "传入fwDeviceScrap")
- public R<IPage<FwDeviceScrapVO>> list(@ApiIgnore @RequestParam Map<String, Object> fwDeviceScrap, Query query) {
- IPage<FwDeviceScrapEntity> pages = fwDeviceScrapService.page(Condition.getPage(query), Condition.getQueryWrapper(fwDeviceScrap, FwDeviceScrapEntity.class));
- return R.data(FwDeviceScrapWrapper.build().pageVO(pages));
}
/**
@@ -86,7 +85,7 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入fwDeviceScrap")
- public R<IPage<FwDeviceScrapVO>> page(FwDeviceScrapVO fwDeviceScrap, Query query) {
+ public R<IPage<FwDeviceScrapVO>> page(FwDeviceScrapDTO fwDeviceScrap, Query query) {
IPage<FwDeviceScrapVO> pages = fwDeviceScrapService.selectFwDeviceScrapPage(Condition.getPage(query), fwDeviceScrap);
return R.data(pages);
}
@@ -96,41 +95,15 @@
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
- @ApiOperation(value = "新增", notes = "传入fwDeviceScrap")
- public R save(@Valid @RequestBody FwDeviceScrapEntity fwDeviceScrap) {
- return R.status(fwDeviceScrapService.save(fwDeviceScrap));
- }
+ @ApiOperation(value = "新增报废记录", notes = "传入fwDeviceScrap，deviceId必填")
+ public R save(@Valid @RequestBody FwDeviceScrapDTO fwDeviceScrap) {
- /**
- * 设备报废记录表 修改
- */
- @PostMapping("/update")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "修改", notes = "传入fwDeviceScrap")
- public R update(@Valid @RequestBody FwDeviceScrapEntity fwDeviceScrap) {
- return R.status(fwDeviceScrapService.updateById(fwDeviceScrap));
- }
+ if (fwDeviceScrap.getDeviceId() == null) {
+ return R.fail("参数错误");
+ }
- /**
- * 设备报废记录表 新增或修改
- */
- @PostMapping("/submit")
- @ApiOperationSupport(order = 6)
- @ApiOperation(value = "新增或修改", notes = "传入fwDeviceScrap")
- public R submit(@Valid @RequestBody FwDeviceScrapEntity fwDeviceScrap) {
- return R.status(fwDeviceScrapService.saveOrUpdate(fwDeviceScrap));
+ return R.status(fwDeviceScrapService.saveFwDeviceScrap(fwDeviceScrap));
}
-
- /**
- * 设备报废记录表 删除
- */
- @PostMapping("/remove")
- @ApiOperationSupport(order = 7)
- @ApiOperation(value = "逻辑删除", notes = "传入ids")
- public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(fwDeviceScrapService.deleteLogic(Func.toLongList(ids)));
- }
-
/**
* 导出数据
@@ -138,6 +111,7 @@
@GetMapping("/export-fwDeviceScrap")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "导出数据", notes = "传入fwDeviceScrap")
+ @ApiIgnore
public void exportFwDeviceScrap(@ApiIgnore @RequestParam Map<String, Object> fwDeviceScrap, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<FwDeviceScrapEntity> queryWrapper = Condition.getQueryWrapper(fwDeviceScrap, FwDeviceScrapEntity.class);
//if (!AuthUtil.isAdministrator()) {
--
Gitblit v1.9.3