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/GdApplicationInnovationController.java | 83 ++++++++---------------------------------
1 files changed, 17 insertions(+), 66 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdApplicationInnovationController.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdApplicationInnovationController.java
index ff71343..dc502d6 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdApplicationInnovationController.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdApplicationInnovationController.java
@@ -16,34 +16,28 @@
*/
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.sxkj.gd.common.GenericConverter;
+import org.sxkj.gd.orderdata.dto.GdApplicationInnovationDTO;
import org.sxkj.gd.orderdata.entity.GdApplicationInnovationEntity;
-import org.sxkj.gd.orderdata.vo.GdApplicationInnovationVO;
-import org.sxkj.gd.orderdata.excel.GdApplicationInnovationExcel;
-import org.sxkj.gd.orderdata.wrapper.GdApplicationInnovationWrapper;
+import org.sxkj.gd.orderdata.param.GdApplicationInnovationPageParam;
+import org.sxkj.gd.orderdata.param.GdApplicationInnovationParam;
import org.sxkj.gd.orderdata.service.IGdApplicationInnovationService;
-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.GdApplicationInnovationVO;
+import org.sxkj.gd.orderdata.wrapper.GdApplicationInnovationWrapper;
+
+import javax.validation.Valid;
/**
* 应用创新案例表 控制器
@@ -65,19 +59,9 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入gdApplicationInnovation")
- public R<GdApplicationInnovationVO> detail(GdApplicationInnovationEntity gdApplicationInnovation) {
- GdApplicationInnovationEntity detail = gdApplicationInnovationService.getOne(Condition.getQueryWrapper(gdApplicationInnovation));
+ public R<GdApplicationInnovationVO> detail(GdApplicationInnovationParam gdApplicationInnovation) {
+ GdApplicationInnovationEntity detail = gdApplicationInnovationService.getOne(Condition.getQueryWrapper(GenericConverter.convert(gdApplicationInnovation, GdApplicationInnovationEntity.class)));
return R.data(GdApplicationInnovationWrapper.build().entityVO(detail));
- }
- /**
- * 应用创新案例表 分页
- */
- @GetMapping("/list")
- @ApiOperationSupport(order = 2)
- @ApiOperation(value = "分页", notes = "传入gdApplicationInnovation")
- public R<IPage<GdApplicationInnovationVO>> list(@ApiIgnore @RequestParam Map<String, Object> gdApplicationInnovation, Query query) {
- IPage<GdApplicationInnovationEntity> pages = gdApplicationInnovationService.page(Condition.getPage(query), Condition.getQueryWrapper(gdApplicationInnovation, GdApplicationInnovationEntity.class));
- return R.data(GdApplicationInnovationWrapper.build().pageVO(pages));
}
/**
@@ -86,30 +70,11 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入gdApplicationInnovation")
- public R<IPage<GdApplicationInnovationVO>> page(GdApplicationInnovationVO gdApplicationInnovation, Query query) {
+ public R<IPage<GdApplicationInnovationVO>> page(GdApplicationInnovationPageParam gdApplicationInnovation, Query query) {
IPage<GdApplicationInnovationVO> pages = gdApplicationInnovationService.selectGdApplicationInnovationPage(Condition.getPage(query), gdApplicationInnovation);
return R.data(pages);
}
- /**
- * 应用创新案例表 新增
- */
- @PostMapping("/save")
- @ApiOperationSupport(order = 4)
- @ApiOperation(value = "新增", notes = "传入gdApplicationInnovation")
- public R save(@Valid @RequestBody GdApplicationInnovationEntity gdApplicationInnovation) {
- return R.status(gdApplicationInnovationService.save(gdApplicationInnovation));
- }
-
- /**
- * 应用创新案例表 修改
- */
- @PostMapping("/update")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "修改", notes = "传入gdApplicationInnovation")
- public R update(@Valid @RequestBody GdApplicationInnovationEntity gdApplicationInnovation) {
- return R.status(gdApplicationInnovationService.updateById(gdApplicationInnovation));
- }
/**
* 应用创新案例表 新增或修改
@@ -117,8 +82,9 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入gdApplicationInnovation")
- public R submit(@Valid @RequestBody GdApplicationInnovationEntity gdApplicationInnovation) {
- return R.status(gdApplicationInnovationService.saveOrUpdate(gdApplicationInnovation));
+ public R submit(@Valid @RequestBody GdApplicationInnovationDTO gdApplicationInnovation) {
+ GdApplicationInnovationEntity gdApplicationInnovationEntity = GdApplicationInnovationWrapper.build().entityDTO(gdApplicationInnovation);
+ return R.status(gdApplicationInnovationService.saveOrUpdate(gdApplicationInnovationEntity));
}
/**
@@ -132,20 +98,5 @@
}
- /**
- * 导出数据
- */
- @GetMapping("/export-gdApplicationInnovation")
- @ApiOperationSupport(order = 9)
- @ApiOperation(value = "导出数据", notes = "传入gdApplicationInnovation")
- public void exportGdApplicationInnovation(@ApiIgnore @RequestParam Map<String, Object> gdApplicationInnovation, BladeUser bladeUser, HttpServletResponse response) {
- QueryWrapper<GdApplicationInnovationEntity> queryWrapper = Condition.getQueryWrapper(gdApplicationInnovation, GdApplicationInnovationEntity.class);
- //if (!AuthUtil.isAdministrator()) {
- // queryWrapper.lambda().eq(GdApplicationInnovation::getTenantId, bladeUser.getTenantId());
- //}
- queryWrapper.lambda().eq(GdApplicationInnovationEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
- List<GdApplicationInnovationExcel> list = gdApplicationInnovationService.exportGdApplicationInnovation(queryWrapper);
- ExcelUtil.export(response, "应用创新案例表数据" + DateUtil.time(), "应用创新案例表数据表", list, GdApplicationInnovationExcel.class);
- }
}
--
Gitblit v1.9.3