From 113cd73922b9b67c261c19c744e46eb2822d7b41 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 14 十一月 2025 14:54:11 +0800
Subject: [PATCH] Merge branch 'prod' into dev_tide
---
src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java | 66 +++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java
new file mode 100644
index 0000000..e6babfe
--- /dev/null
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java
@@ -0,0 +1,66 @@
+package com.ruoyi.equipmentenergyconsumption.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.dto.ProductDto;
+import com.ruoyi.basic.dto.ProductTreeDto;
+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 org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+@RestController
+@Api(tags = "鐢ㄧ數鍖哄煙")
+@RequestMapping("/electricityConsumptionArea")
+public class ElectricityConsumptionAreaController extends BaseController {
+
+ @Autowired
+ private ElectricityConsumptionAreaService electricityConsumptionAreaService;
+
+ /**
+ * 鏌ヨ鏍戠粨鏋�
+ */
+ @GetMapping("/list")
+ public List<ElectricityConsumptionAreaTreeDto> selectElectricityConsumptionAreaList() {
+ return electricityConsumptionAreaService.selectElectricityConsumptionAreaList();
+ }
+
+ @GetMapping("/listPage")
+ @ApiOperation("鐢ㄧ數鍖哄煙-鍒嗛〉鏌ヨ")
+ @Log(title = "鐢ㄧ數鍖哄煙-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
+ public AjaxResult listPage(Page page, ElectricityConsumptionArea electricityConsumptionArea) {
+ IPage<ElectricityConsumptionArea> listPage = electricityConsumptionAreaService.listPage(page, electricityConsumptionArea);
+ return AjaxResult.success(listPage);
+ }
+
+ @PostMapping("/add")
+ @ApiOperation("鐢ㄧ數鍖哄煙-鏂板")
+ @Log(title = "鐢ㄧ數鍖哄煙-鏂板", businessType = BusinessType.INSERT)
+ public AjaxResult add(@RequestBody ElectricityConsumptionArea electricityConsumptionArea) {
+ boolean save = electricityConsumptionAreaService.saveOrUpdate(electricityConsumptionArea);
+ return save ? AjaxResult.success() : AjaxResult.error();
+ }
+
+ @DeleteMapping("/delete")
+ @ApiOperation("鐢ㄧ數鍖哄煙-鍒犻櫎")
+ @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();
+ }
+
+}
--
Gitblit v1.9.3