From 03df670a1dfbcae8031e84e15dff0b77365f0af6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 14 八月 2025 16:39:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into pim_zss
---
src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java | 33 ++++++++++++---------------------
1 files changed, 12 insertions(+), 21 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..e6babfe 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java
@@ -2,8 +2,11 @@
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;
@@ -27,6 +30,14 @@
@Autowired
private ElectricityConsumptionAreaService electricityConsumptionAreaService;
+ /**
+ * 鏌ヨ鏍戠粨鏋�
+ */
+ @GetMapping("/list")
+ public List<ElectricityConsumptionAreaTreeDto> selectElectricityConsumptionAreaList() {
+ return electricityConsumptionAreaService.selectElectricityConsumptionAreaList();
+ }
+
@GetMapping("/listPage")
@ApiOperation("鐢ㄧ數鍖哄煙-鍒嗛〉鏌ヨ")
@Log(title = "鐢ㄧ數鍖哄煙-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@@ -39,16 +50,8 @@
@ApiOperation("鐢ㄧ數鍖哄煙-鏂板")
@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")
@@ -58,18 +61,6 @@
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