From 5fca9c4f75933fd4ea8c517bf6b1acc6a9f3d654 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 21 五月 2026 13:52:56 +0800
Subject: [PATCH] 质量增加日志
---
src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java | 102 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 76 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java
index 429423f..c18d5f7 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java
@@ -1,21 +1,29 @@
package com.ruoyi.equipmentenergyconsumption.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.pojo.Customer;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.device.pojo.DeviceLedger;
+import com.ruoyi.equipmentenergyconsumption.dto.EquipmentEnergyConsumptionDto;
import com.ruoyi.equipmentenergyconsumption.pojo.EquipmentEnergyConsumption;
import com.ruoyi.equipmentenergyconsumption.service.EquipmentEnergyConsumptionService;
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 com.ruoyi.framework.web.domain.R;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import jakarta.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -23,53 +31,60 @@
* @date : 2025/7/29 13:19
*/
@RestController
-@Api(tags = "璁惧鑳借��")
+@Tag(name = "璁惧鑳借��")
@RequestMapping("/equipmentEnergyConsumption")
+@AllArgsConstructor
public class EquipmentEnergyConsumptionController extends BaseController {
-
- @Autowired
private EquipmentEnergyConsumptionService equipmentEnergyConsumptionService;
@GetMapping("/listPage")
- @ApiOperation("璁惧鑳借��-鍒嗛〉鏌ヨ")
+ @Operation(summary = "璁惧鑳借��-鍒嗛〉鏌ヨ")
@Log(title = "璁惧鑳借��-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPage(Page page, EquipmentEnergyConsumption equipmentEnergyConsumption) {
+ public R<?> listPage(Page page, EquipmentEnergyConsumption equipmentEnergyConsumption) {
IPage<EquipmentEnergyConsumption> listPage = equipmentEnergyConsumptionService.listPage(page, equipmentEnergyConsumption);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
@GetMapping("/deviceList")
- @ApiOperation("璁惧鍙拌处-鏌ヨ")
+ @Operation(summary = "璁惧鍙拌处-鏌ヨ")
@Log(title = "璁惧鍙拌处-鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult deviceList(DeviceLedger deviceLedger) {
+ public R<?> deviceList(DeviceLedger deviceLedger) {
List<DeviceLedger> listPage = equipmentEnergyConsumptionService.deviceList(deviceLedger);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
@PostMapping("/add")
- @ApiOperation("璁惧鑳借��-鏂板")
+ @Operation(summary = "璁惧鑳借��-鏂板")
@Log(title = "璁惧鑳借��-鏂板", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody EquipmentEnergyConsumption equipmentEnergyConsumption) {
+ public R<?> add(@RequestBody EquipmentEnergyConsumption equipmentEnergyConsumption) {
boolean save = equipmentEnergyConsumptionService.save(equipmentEnergyConsumption);
- return save ? AjaxResult.success() : AjaxResult.error();
+ return save ? R.ok() : R.fail();
+ }
+
+ @PostMapping("/addBatch")
+ @Operation(summary = "璁惧鑳借��-鎵归噺鏂板")
+ @Log(title = "璁惧鑳借��-鎵归噺鏂板", businessType = BusinessType.INSERT)
+ public R<?> addBatch(@RequestBody List<EquipmentEnergyConsumption> list) {
+ boolean save = equipmentEnergyConsumptionService.saveBatch(list);
+ return save ? R.ok() : R.fail();
}
@PostMapping("/update")
- @ApiOperation("璁惧鑳借��-淇敼")
+ @Operation(summary = "璁惧鑳借��-淇敼")
@Log(title = "璁惧鑳借��-淇敼", businessType = BusinessType.UPDATE)
- public AjaxResult update(@RequestBody EquipmentEnergyConsumption equipmentEnergyConsumption) {
+ public R<?> update(@RequestBody EquipmentEnergyConsumption equipmentEnergyConsumption) {
boolean update = equipmentEnergyConsumptionService.updateById(equipmentEnergyConsumption);
- return update ? AjaxResult.success() : AjaxResult.error();
+ return update ? R.ok() : R.fail();
}
@DeleteMapping("/delete")
- @ApiOperation("璁惧鑳借��-鍒犻櫎")
+ @Operation(summary = "璁惧鑳借��-鍒犻櫎")
@Log(title = "璁惧鑳借��-鍒犻櫎", businessType = BusinessType.DELETE)
- public AjaxResult delete(@RequestBody List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ public R<?> delete(@RequestBody List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)) return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
boolean remove = equipmentEnergyConsumptionService.removeBatchByIds(ids);
- return remove ? AjaxResult.success() : AjaxResult.error();
+ return remove ? R.ok() : R.fail();
}
/**
@@ -77,16 +92,51 @@
*/
@Log(title = "瀵煎叆璁惧鑳借��", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
- public AjaxResult importData(MultipartFile file) throws Exception {
+ @Operation(summary = "瀵煎叆璁惧鑳借��")
+ public R<?> importData(MultipartFile file) throws Exception {
return equipmentEnergyConsumptionService.importData(file);
}
+ /**
+ * 瀵煎嚭璁惧鑳借��
+ */
+ @Log(title = "瀵煎嚭璁惧鑳借��", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ @Operation(summary = "瀵煎嚭璁惧鑳借��")
+ public void export(HttpServletResponse response) {
+ Page page = new Page<>(-1,-1);
+ EquipmentEnergyConsumption equipmentEnergyConsumption = new EquipmentEnergyConsumption();
+ IPage<EquipmentEnergyConsumption> listPage = equipmentEnergyConsumptionService.listPage(page, equipmentEnergyConsumption);
+ ExcelUtil<EquipmentEnergyConsumption> util = new ExcelUtil<EquipmentEnergyConsumption>(EquipmentEnergyConsumption.class);
+ util.exportExcel(response, listPage.getRecords() , "瀵煎嚭璁惧鑳借��");
+ }
+
@GetMapping("/listPageByTrend")
- @ApiOperation("璁惧鑳借��-鑳芥簮瓒嬪娍-鍒嗛〉鏌ヨ")
+ @Operation(summary = "璁惧鑳借��-鑳芥簮瓒嬪娍-鍒嗛〉鏌ヨ")
@Log(title = "璁惧鑳借��-鑳芥簮瓒嬪娍-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPageByTrend(Page page, EquipmentEnergyConsumption equipmentEnergyConsumption) {
+ public R<?> listPageByTrend(Page page, EquipmentEnergyConsumption equipmentEnergyConsumption) {
IPage<EquipmentEnergyConsumption> listPage = equipmentEnergyConsumptionService.listPageByTrend(page, equipmentEnergyConsumption);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
+ }
+
+ /**
+ * 瀵煎嚭鑳芥簮瓒嬪娍
+ */
+ @Log(title = "瀵煎嚭鑳芥簮瓒嬪娍", businessType = BusinessType.EXPORT)
+ @PostMapping("/exportTwo")
+ @Operation(summary = "瀵煎嚭鑳芥簮瓒嬪娍")
+ public void exportTwo(HttpServletResponse response) {
+ Page page = new Page<>(-1,-1);
+ EquipmentEnergyConsumption equipmentEnergyConsumption = new EquipmentEnergyConsumption();
+ IPage<EquipmentEnergyConsumption> listPage = equipmentEnergyConsumptionService.listPageByTrend(page, equipmentEnergyConsumption);
+ List<EquipmentEnergyConsumptionDto> list = new ArrayList<>();
+ listPage.getRecords().forEach(item -> {
+ EquipmentEnergyConsumptionDto dto = new EquipmentEnergyConsumptionDto();
+ BeanUtils.copyProperties(item, dto);
+ list.add(dto);
+ });
+ ExcelUtil<EquipmentEnergyConsumptionDto> util = new ExcelUtil<EquipmentEnergyConsumptionDto>(EquipmentEnergyConsumptionDto.class);
+ util.exportExcel(response, list , "瀵煎嚭鑳芥簮瓒嬪娍");
}
--
Gitblit v1.9.3