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/orderdata/controller/GdSupplyDemandController.java | 178 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 98 insertions(+), 80 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdSupplyDemandController.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdSupplyDemandController.java
index f1f01a1..1fa70ef 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdSupplyDemandController.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdSupplyDemandController.java
@@ -16,34 +16,32 @@
*/
package org.sxkj.gd.orderdata.controller;
+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.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.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.sxkj.gd.orderdata.dto.GdSupplyDemandAuditActionDTO;
+import org.sxkj.gd.orderdata.dto.GdSupplyDemandDTO;
import org.sxkj.gd.orderdata.entity.GdSupplyDemandEntity;
-import org.sxkj.gd.orderdata.vo.GdSupplyDemandVO;
-import org.sxkj.gd.orderdata.excel.GdSupplyDemandExcel;
-import org.sxkj.gd.orderdata.wrapper.GdSupplyDemandWrapper;
+import org.sxkj.gd.orderdata.param.GdSupplyDemandPageParam;
import org.sxkj.gd.orderdata.service.IGdSupplyDemandService;
-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 springfox.documentation.annotations.ApiIgnore;
-import java.util.Map;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
+import org.sxkj.gd.orderdata.vo.GdSupplyDemandVO;
+import org.sxkj.gd.orderdata.wrapper.GdSupplyDemandWrapper;
+
+import javax.validation.Valid;
/**
* 供需需求信息表 控制器
@@ -63,89 +61,109 @@
* 供需需求信息表 详情
*/
@GetMapping("/detail")
- @ApiOperationSupport(order = 1)
- @ApiOperation(value = "详情", notes = "传入gdSupplyDemand")
- public R<GdSupplyDemandVO> detail(GdSupplyDemandEntity gdSupplyDemand) {
- GdSupplyDemandEntity detail = gdSupplyDemandService.getOne(Condition.getQueryWrapper(gdSupplyDemand));
- return R.data(GdSupplyDemandWrapper.build().entityVO(detail));
- }
- /**
- * 供需需求信息表 分页
- */
- @GetMapping("/list")
- @ApiOperationSupport(order = 2)
- @ApiOperation(value = "分页", notes = "传入gdSupplyDemand")
- public R<IPage<GdSupplyDemandVO>> list(@ApiIgnore @RequestParam Map<String, Object> gdSupplyDemand, Query query) {
- IPage<GdSupplyDemandEntity> pages = gdSupplyDemandService.page(Condition.getPage(query), Condition.getQueryWrapper(gdSupplyDemand, GdSupplyDemandEntity.class));
- return R.data(GdSupplyDemandWrapper.build().pageVO(pages));
- }
+ @ApiOperationSupport(order = 1)
+ @ApiOperation(value = "详情", notes = "传入gdSupplyDemand")
+ public R<GdSupplyDemandVO> detail(GdSupplyDemandDTO gdSupplyDemand) {
+ GdSupplyDemandEntity detail = gdSupplyDemandService.detailSupplyDemand(gdSupplyDemand);
+ return R.data(GdSupplyDemandWrapper.build().entityVO(detail));
+ }
+// /**
+// * 供需需求信息表 分页
+// */
+// @GetMapping("/list")
+// @ApiOperationSupport(order = 2)
+// @ApiOperation(value = "分页", notes = "传入gdSupplyDemand")
+// public R<IPage<GdSupplyDemandVO>> list(GdSupplyDemandDTO gdSupplyDemand, Query query) {
+// IPage<GdSupplyDemandEntity> pages = gdSupplyDemandService.selectGdSupplyDemandList(Condition.getPage(query), gdSupplyDemand);
+// return R.data(GdSupplyDemandWrapper.build().pageVO(pages));
+// }
/**
* 供需需求信息表 自定义分页
*/
@GetMapping("/page")
- @ApiOperationSupport(order = 3)
- @ApiOperation(value = "分页", notes = "传入gdSupplyDemand")
- public R<IPage<GdSupplyDemandVO>> page(GdSupplyDemandVO gdSupplyDemand, Query query) {
- IPage<GdSupplyDemandVO> pages = gdSupplyDemandService.selectGdSupplyDemandPage(Condition.getPage(query), gdSupplyDemand);
- return R.data(pages);
- }
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入gdSupplyDemand")
+ public R<IPage<GdSupplyDemandVO>> page(GdSupplyDemandPageParam gdSupplyDemand, Query query) {
+ IPage<GdSupplyDemandVO> pages = gdSupplyDemandService.selectGdSupplyDemandPage(Condition.getPage(query), gdSupplyDemand);
+ return R.data(pages);
+ }
- /**
- * 供需需求信息表 新增
- */
- @PostMapping("/save")
- @ApiOperationSupport(order = 4)
- @ApiOperation(value = "新增", notes = "传入gdSupplyDemand")
- public R save(@Valid @RequestBody GdSupplyDemandEntity gdSupplyDemand) {
- return R.status(gdSupplyDemandService.save(gdSupplyDemand));
- }
+// /**
+// * 供需需求信息表 新增
+// */
+// @PostMapping("/save")
+// @ApiOperationSupport(order = 4)
+// @ApiOperation(value = "新增", notes = "传入gdSupplyDemand")
+// public R save(@Valid @RequestBody GdSupplyDemandEntity gdSupplyDemand) {
+// return R.status(gdSupplyDemandService.save(gdSupplyDemand));
+// }
- /**
- * 供需需求信息表 修改
- */
- @PostMapping("/update")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "修改", notes = "传入gdSupplyDemand")
- public R update(@Valid @RequestBody GdSupplyDemandEntity gdSupplyDemand) {
- return R.status(gdSupplyDemandService.updateById(gdSupplyDemand));
- }
+// /**
+// * 供需需求信息表 修改
+// */
+// @PostMapping("/update")
+// @ApiOperationSupport(order = 5)
+// @ApiOperation(value = "修改", notes = "传入gdSupplyDemand")
+// public R update(@Valid @RequestBody GdSupplyDemandEntity gdSupplyDemand) {
+// return R.status(gdSupplyDemandService.updateById(gdSupplyDemand));
+// }
/**
* 供需需求信息表 新增或修改
*/
@PostMapping("/submit")
- @ApiOperationSupport(order = 6)
- @ApiOperation(value = "新增或修改", notes = "传入gdSupplyDemand")
- public R submit(@Valid @RequestBody GdSupplyDemandEntity gdSupplyDemand) {
- return R.status(gdSupplyDemandService.saveOrUpdate(gdSupplyDemand));
- }
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "新增或修改", notes = "传入gdSupplyDemand")
+ public R submit(@Valid @RequestBody GdSupplyDemandDTO gdSupplyDemand) {
+ return R.status(gdSupplyDemandService.submitSupplyDemand(gdSupplyDemand));
+ }
+
+ /**
+ * 供需需求信息表 审核通过
+ */
+ @PostMapping("/audit-pass")
+ @ApiOperationSupport(order = 7)
+ @ApiOperation(value = "审核通过", notes = "传入审核参数")
+ public R auditPass(@Valid @RequestBody GdSupplyDemandAuditActionDTO auditAction) {
+ return R.status(gdSupplyDemandService.approveSupplyDemand(auditAction.getDemandId(), auditAction.getAuditOpinion(), auditAction.getAttachIds()));
+ }
+
+ /**
+ * 供需需求信息表 拒绝申请
+ */
+ @PostMapping("/audit-reject")
+ @ApiOperationSupport(order = 8)
+ @ApiOperation(value = "拒绝申请", notes = "传入审核参数")
+ public R auditReject(@Valid @RequestBody GdSupplyDemandAuditActionDTO auditAction) {
+ return R.status(gdSupplyDemandService.rejectSupplyDemand(auditAction.getDemandId(), auditAction.getAuditOpinion()));
+ }
/**
* 供需需求信息表 删除
*/
@PostMapping("/remove")
- @ApiOperationSupport(order = 7)
- @ApiOperation(value = "逻辑删除", notes = "传入ids")
- public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(gdSupplyDemandService.deleteLogic(Func.toLongList(ids)));
- }
+ @ApiOperationSupport(order = 9)
+ @ApiOperation(value = "逻辑删除", notes = "传入ids")
+ public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ return R.status(gdSupplyDemandService.deleteLogic(Func.toLongList(ids)));
+ }
- /**
- * 导出数据
- */
- @GetMapping("/export-gdSupplyDemand")
- @ApiOperationSupport(order = 9)
- @ApiOperation(value = "导出数据", notes = "传入gdSupplyDemand")
- public void exportGdSupplyDemand(@ApiIgnore @RequestParam Map<String, Object> gdSupplyDemand, BladeUser bladeUser, HttpServletResponse response) {
- QueryWrapper<GdSupplyDemandEntity> queryWrapper = Condition.getQueryWrapper(gdSupplyDemand, GdSupplyDemandEntity.class);
+// /**
+// * 导出数据
+// */
+// @GetMapping("/export-gdSupplyDemand")
+// @ApiOperationSupport(order = 9)
+// @ApiOperation(value = "导出数据", notes = "传入gdSupplyDemand")
+// public void exportGdSupplyDemand(@ApiIgnore @RequestParam Map<String, Object> gdSupplyDemand, BladeUser bladeUser, HttpServletResponse response) {
+// QueryWrapper<GdSupplyDemandEntity> queryWrapper = Condition.getQueryWrapper(gdSupplyDemand, GdSupplyDemandEntity.class);
//if (!AuthUtil.isAdministrator()) {
// queryWrapper.lambda().eq(GdSupplyDemand::getTenantId, bladeUser.getTenantId());
//}
- queryWrapper.lambda().eq(GdSupplyDemandEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
- List<GdSupplyDemandExcel> list = gdSupplyDemandService.exportGdSupplyDemand(queryWrapper);
- ExcelUtil.export(response, "供需需求信息表数据" + DateUtil.time(), "供需需求信息表数据表", list, GdSupplyDemandExcel.class);
- }
+// queryWrapper.lambda().eq(GdSupplyDemandEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+// List<GdSupplyDemandExcel> list = gdSupplyDemandService.exportGdSupplyDemand(queryWrapper);
+// ExcelUtil.export(response, "供需需求信息表数据" + DateUtil.time(), "供需需求信息表数据表", list, GdSupplyDemandExcel.class);
+// }
}
--
Gitblit v1.9.3