From db3170308449eabf2037a692268bc5948b14390b Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 15 Jan 2026 15:43:37 +0800
Subject: [PATCH] 运营收益
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/controller/GdOperationalRevenueController.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/controller/OperationalRevenueController.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/controller/GdOperationalRevenueController.java
similarity index 77%
rename from drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/controller/OperationalRevenueController.java
rename to drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/controller/GdOperationalRevenueController.java
index 912d034..e1223c7 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/controller/OperationalRevenueController.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/controller/GdOperationalRevenueController.java
@@ -5,13 +5,14 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
import org.springblade.core.secure.utils.AuthUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.sxkj.common.model.ResponseResult;
-import org.sxkj.gd.workOrder.entity.OperationalRevenue;
-import org.sxkj.gd.workOrder.service.OperationalRevenueService;
-import org.sxkj.gd.workOrder.vo.OperationalRevenueVo;
+import org.sxkj.gd.workOrder.entity.GdOperationalRevenue;
+import org.sxkj.gd.workOrder.service.GdOperationalRevenueService;
+import org.sxkj.gd.workOrder.vo.GdOperationalRevenueVo;
import java.time.LocalDateTime;
import java.util.List;
@@ -22,11 +23,11 @@
*/
@Api(tags = "运营收益管理")
@RestController
+@AllArgsConstructor
@RequestMapping("/revenue")
-public class OperationalRevenueController {
+public class GdOperationalRevenueController {
- @Autowired
- private OperationalRevenueService operationalRevenueService;
+ private final GdOperationalRevenueService operationalRevenueService;
/**
* 分页查询运营收益
@@ -43,11 +44,11 @@
@ApiParam("市场空间") @RequestParam(value = "marketSpace", required = false) String marketSpace,
@ApiParam("创建人") @RequestParam(value = "nickName", required = false) String nickName
) {
- Page<OperationalRevenue> page = new Page<>(current, size);
- IPage<OperationalRevenue> result = operationalRevenueService.selectPage(page, operatingIncome, totalCost, netProfit, financialIrr, marketSpace, nickName);
+ Page<GdOperationalRevenue> page = new Page<>(current, size);
+ IPage<GdOperationalRevenue> result = operationalRevenueService.selectPage(page, operatingIncome, totalCost, netProfit, financialIrr, marketSpace, nickName);
// 转换为Vo分页
- IPage<OperationalRevenueVo> voPage = result.convert(operationalRevenueService::convertToVo);
+ IPage<GdOperationalRevenueVo> voPage = result.convert(operationalRevenueService::convertToVo);
return ResponseResult.success(voPage);
}
@@ -57,10 +58,10 @@
@ApiOperation("查询所有运营收益")
@GetMapping("/list")
public ResponseResult list() {
- List<OperationalRevenue> list = operationalRevenueService.list();
+ List<GdOperationalRevenue> list = operationalRevenueService.list();
// 转换为Vo列表
- List<OperationalRevenueVo> voList = list.stream()
+ List<GdOperationalRevenueVo> voList = list.stream()
.map(operationalRevenueService::convertToVo)
.collect(Collectors.toList());
return ResponseResult.success(voList);
@@ -74,10 +75,10 @@
@ApiOperation("根据ID查询运营收益")
@GetMapping("selectById/{id}")
public ResponseResult getById(@ApiParam("主键ID") @PathVariable Long id) {
- OperationalRevenue operationalRevenue = operationalRevenueService.getById(id);
+ GdOperationalRevenue operationalRevenue = operationalRevenueService.getById(id);
// 转换为Vo对象
- OperationalRevenueVo vo = operationalRevenueService.convertToVo(operationalRevenue);
+ GdOperationalRevenueVo vo = operationalRevenueService.convertToVo(operationalRevenue);
return ResponseResult.success(vo);
}
@@ -86,7 +87,7 @@
*/
@ApiOperation("新增运营收益")
@PostMapping("/add")
- public ResponseResult save(@RequestBody OperationalRevenue operationalRevenue) {
+ public ResponseResult save(@RequestBody GdOperationalRevenue operationalRevenue) {
operationalRevenue.setCreateUser(String.valueOf(AuthUtil.getUserId()));
LocalDateTime now = LocalDateTime.now();
operationalRevenue.setCreateTime(now);
@@ -103,7 +104,7 @@
*/
@ApiOperation("修改运营收益")
@PutMapping("update")
- public ResponseResult updateById(@RequestBody OperationalRevenue operationalRevenue) {
+ public ResponseResult updateById(@RequestBody GdOperationalRevenue operationalRevenue) {
LocalDateTime now = LocalDateTime.now();
operationalRevenue.setUpdateTime(now);
operationalRevenue.setUpdateUser(String.valueOf(AuthUtil.getUserId()));
--
Gitblit v1.9.3