From c247f5bf64c98595cc7e4efc9e1ae7ff1df79c11 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 14:05:32 +0800
Subject: [PATCH] refactor(swagger): 迁移Swagger注解到OpenAPI 3.0
---
src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java | 52 +++++++++++++++++++---------------------------------
1 files changed, 19 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java
index 8381c9d..bba6088 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java
@@ -2,33 +2,39 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.device.pojo.DeviceLedger;
+import com.ruoyi.equipmentenergyconsumption.dto.ElectricityConsumptionAreaTreeDto;
import com.ruoyi.equipmentenergyconsumption.pojo.ElectricityConsumptionArea;
import com.ruoyi.equipmentenergyconsumption.service.ElectricityConsumptionAreaService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
import java.util.List;
@RestController
-@Api(tags = "鐢ㄧ數鍖哄煙")
+@Tag(name = "鐢ㄧ數鍖哄煙")
@RequestMapping("/electricityConsumptionArea")
+@AllArgsConstructor
public class ElectricityConsumptionAreaController extends BaseController {
- @Autowired
- private ElectricityConsumptionAreaService electricityConsumptionAreaService;
+ private final ElectricityConsumptionAreaService electricityConsumptionAreaService;
+
+ /**
+ * 鏌ヨ鏍戠粨鏋�
+ */
+ @GetMapping("/list")
+ public List<ElectricityConsumptionAreaTreeDto> selectElectricityConsumptionAreaList() {
+ return electricityConsumptionAreaService.selectElectricityConsumptionAreaList();
+ }
@GetMapping("/listPage")
- @ApiOperation("鐢ㄧ數鍖哄煙-鍒嗛〉鏌ヨ")
+ @Operation(summary = "鐢ㄧ數鍖哄煙-鍒嗛〉鏌ヨ")
@Log(title = "鐢ㄧ數鍖哄煙-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult listPage(Page page, ElectricityConsumptionArea electricityConsumptionArea) {
IPage<ElectricityConsumptionArea> listPage = electricityConsumptionAreaService.listPage(page, electricityConsumptionArea);
@@ -36,40 +42,20 @@
}
@PostMapping("/add")
- @ApiOperation("鐢ㄧ數鍖哄煙-鏂板")
+ @Operation(summary = "鐢ㄧ數鍖哄煙-鏂板")
@Log(title = "鐢ㄧ數鍖哄煙-鏂板", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody ElectricityConsumptionArea electricityConsumptionArea) {
- boolean save = electricityConsumptionAreaService.save(electricityConsumptionArea);
+ boolean save = electricityConsumptionAreaService.saveOrUpdate(electricityConsumptionArea);
return save ? AjaxResult.success() : AjaxResult.error();
}
- @PostMapping("/update")
- @ApiOperation("鐢ㄧ數鍖哄煙-淇敼")
- @Log(title = "鐢ㄧ數鍖哄煙-淇敼", businessType = BusinessType.UPDATE)
- public AjaxResult update(@RequestBody ElectricityConsumptionArea electricityConsumptionArea) {
- boolean update = electricityConsumptionAreaService.updateById(electricityConsumptionArea);
- return update ? AjaxResult.success() : AjaxResult.error();
- }
-
@DeleteMapping("/delete")
- @ApiOperation("鐢ㄧ數鍖哄煙-鍒犻櫎")
+ @Operation(summary = "鐢ㄧ數鍖哄煙-鍒犻櫎")
@Log(title = "鐢ㄧ數鍖哄煙-鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
boolean remove = electricityConsumptionAreaService.removeBatchByIds(ids);
return remove ? AjaxResult.success() : AjaxResult.error();
- }
-
-
- /**
- * 瀵煎嚭鐢ㄧ數鍖哄煙
- */
- @Log(title = "瀵煎嚭鐢ㄧ數鍖哄煙", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- @ApiOperation("瀵煎嚭鐢ㄧ數鍖哄煙")
- public void export(HttpServletResponse response) {
- ExcelUtil<ElectricityConsumptionArea> util = new ExcelUtil<ElectricityConsumptionArea>(ElectricityConsumptionArea.class);
- util.exportExcel(response, null , "鐢ㄧ數鍖哄煙鏁版嵁");
}
}
--
Gitblit v1.9.3