Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

liyong

2 天以前 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd

 src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java

@@ -13,15 +13,16 @@
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 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 javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;

@@ -30,16 +31,15 @@
 * @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) {
        IPage<EquipmentEnergyConsumption> listPage = equipmentEnergyConsumptionService.listPage(page, equipmentEnergyConsumption);
@@ -47,7 +47,7 @@
    }

    @GetMapping("/deviceList")
    @ApiOperation("设备台账-查询")
    @Operation(summary = "设备台账-查询")
    @Log(title = "设备台账-查询", businessType = BusinessType.OTHER)
    public AjaxResult deviceList(DeviceLedger deviceLedger) {
        List<DeviceLedger> listPage = equipmentEnergyConsumptionService.deviceList(deviceLedger);
@@ -55,7 +55,7 @@
    }

    @PostMapping("/add")
    @ApiOperation("设备能耗-新增")
    @Operation(summary = "设备能耗-新增")
    @Log(title = "设备能耗-新增", businessType = BusinessType.INSERT)
    public AjaxResult add(@RequestBody EquipmentEnergyConsumption equipmentEnergyConsumption) {
        boolean save = equipmentEnergyConsumptionService.save(equipmentEnergyConsumption);
@@ -63,7 +63,7 @@
    }

    @PostMapping("/addBatch")
    @ApiOperation("设备能耗-批量新增")
    @Operation(summary = "设备能耗-批量新增")
    @Log(title = "设备能耗-批量新增", businessType = BusinessType.INSERT)
    public AjaxResult addBatch(@RequestBody List<EquipmentEnergyConsumption> list) {
        boolean save = equipmentEnergyConsumptionService.saveBatch(list);
@@ -71,7 +71,7 @@
    }

    @PostMapping("/update")
    @ApiOperation("设备能耗-修改")
    @Operation(summary = "设备能耗-修改")
    @Log(title = "设备能耗-修改", businessType = BusinessType.UPDATE)
    public AjaxResult update(@RequestBody EquipmentEnergyConsumption equipmentEnergyConsumption) {
        boolean update = equipmentEnergyConsumptionService.updateById(equipmentEnergyConsumption);
@@ -79,7 +79,7 @@
    }

    @DeleteMapping("/delete")
    @ApiOperation("设备能耗-删除")
    @Operation(summary = "设备能耗-删除")
    @Log(title = "设备能耗-删除", businessType = BusinessType.DELETE)
    public AjaxResult delete(@RequestBody List<Long> ids) {
        if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("请选择至少一条数据");
@@ -92,7 +92,7 @@
     */
    @Log(title = "导入设备能耗", businessType = BusinessType.IMPORT)
    @PostMapping("/importData")
    @ApiOperation("导入设备能耗")
    @Operation(summary = "导入设备能耗")
    public AjaxResult importData(MultipartFile file) throws Exception {
        return equipmentEnergyConsumptionService.importData(file);
    }
@@ -102,7 +102,7 @@
     */
    @Log(title = "导出设备能耗", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    @ApiOperation("导出设备能耗")
    @Operation(summary = "导出设备能耗")
    public void export(HttpServletResponse response) {
        Page page = new Page<>(-1,-1);
        EquipmentEnergyConsumption equipmentEnergyConsumption = new EquipmentEnergyConsumption();
@@ -112,7 +112,7 @@
    }

    @GetMapping("/listPageByTrend")
    @ApiOperation("设备能耗-能源趋势-分页查询")
    @Operation(summary = "设备能耗-能源趋势-分页查询")
    @Log(title = "设备能耗-能源趋势-分页查询", businessType = BusinessType.OTHER)
    public AjaxResult listPageByTrend(Page page, EquipmentEnergyConsumption equipmentEnergyConsumption) {
        IPage<EquipmentEnergyConsumption> listPage = equipmentEnergyConsumptionService.listPageByTrend(page, equipmentEnergyConsumption);
@@ -124,7 +124,7 @@
     */
    @Log(title = "导出能源趋势", businessType = BusinessType.EXPORT)
    @PostMapping("/exportTwo")
    @ApiOperation("导出能源趋势")
    @Operation(summary = "导出能源趋势")
    public void exportTwo(HttpServletResponse response) {
        Page page = new Page<>(-1,-1);
        EquipmentEnergyConsumption equipmentEnergyConsumption = new EquipmentEnergyConsumption();