修改能耗目标配置，能耗定额配置，新增能源监控，峰平谷

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/utils/DateUtils.java

@@ -292,4 +292,12 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         return Date.from(getPreviousDayEnd(daysAgo).atZone(ZoneId.systemDefault()).toInstant());
     }
 
+    /**
+     * 根据月份获取季度
+     * @param month 月份
+     * @return 季度
+     */
+    public static int getQuarter(int month) {
+        return ((month - 1) / 3) + 1;
+    }
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsEnergyMonitorController.java

@@ -0,0 +1,131 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.desk.energy.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.annotation.IsAdmin;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.desk.energy.excel.BsEnergyMonitorExcel;
+import org.springblade.desk.energy.pojo.entity.BsEnergyMonitorEntity;
+import org.springblade.desk.energy.pojo.vo.BsEnergyMonitorVO;
+import org.springblade.desk.energy.service.IBsEnergyMonitorService;
+import org.springblade.desk.energy.wrapper.BsEnergyMonitorWrapper;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 能源监控表 控制器
+ *
+ * @author BladeX
+ * @since 2026-03-03
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/bsEnergyMonitor")
+@Tag(name = "能源监控表", description = "能源监控表接口")
+public class BsEnergyMonitorController extends BladeController {
+
+	private final IBsEnergyMonitorService bsEnergyMonitorService;
+
+	/**
+	 * 能源监控表 详情
+	 */
+	@GetMapping("/detail")
+	@Operation(summary = "详情", description  = "传入bsEnergyMonitor")
+	public R<BsEnergyMonitorVO> detail(BsEnergyMonitorEntity bsEnergyMonitor) {
+		BsEnergyMonitorEntity detail = bsEnergyMonitorService.getOne(Condition.getQueryWrapper(bsEnergyMonitor));
+		return R.data(BsEnergyMonitorWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 能源监控表 自定义分页
+	 */
+	@GetMapping("/page")
+	@Operation(summary = "分页", description  = "传入bsEnergyMonitor")
+	public R<IPage<BsEnergyMonitorVO>> page(BsEnergyMonitorVO bsEnergyMonitor, Query query) {
+		IPage<BsEnergyMonitorVO> pages = bsEnergyMonitorService.selectBsEnergyMonitorPage(Condition.getPage(query), bsEnergyMonitor);
+		return R.data(pages);
+	}
+
+	/**
+	 * 能源监控表 新增或修改
+	 */
+	@PostMapping("/submit")
+	@Operation(summary = "新增或修改", description  = "传入bsEnergyMonitor")
+	public R submit(@Valid @RequestBody BsEnergyMonitorEntity bsEnergyMonitor) {
+		if (bsEnergyMonitor.getId() == null) {
+			// 新增需要校验
+			BsEnergyMonitorEntity bsEnergyMonitorEntity = bsEnergyMonitorService.getOne(new QueryWrapper<BsEnergyMonitorEntity>().eq("month", bsEnergyMonitor.getMonth()));
+			if (bsEnergyMonitorEntity != null) {
+				return R.fail("该月份能源监控表已存在");
+			}
+		}
+		bsEnergyMonitor.setLastWaterRate(bsEnergyMonitor.getLastWater().divide(bsEnergyMonitor.getLastWaterTarget(), 2));
+		bsEnergyMonitor.setLastElectricRate(bsEnergyMonitor.getLastElectric().divide(bsEnergyMonitor.getLastElectricTarget(), 2));
+		bsEnergyMonitor.setCurrentWaterRate(bsEnergyMonitor.getCurrentWater().divide(bsEnergyMonitor.getCurrentWaterTarget(), 2));
+		bsEnergyMonitor.setCurrentElectricRate(bsEnergyMonitor.getCurrentElectric().divide(bsEnergyMonitor.getCurrentElectricTarget(), 2));
+		return R.status(bsEnergyMonitorService.saveOrUpdate(bsEnergyMonitor));
+	}
+
+	/**
+	 * 能源监控表 删除
+	 */
+	@PostMapping("/remove")
+	@Operation(summary = "逻辑删除", description  = "传入ids")
+	public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(bsEnergyMonitorService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@IsAdmin
+	@GetMapping("/export-bsEnergyMonitor")
+	@Operation(summary = "导出数据", description  = "传入bsEnergyMonitor")
+	public void exportBsEnergyMonitor(@Parameter(hidden = true) @RequestParam Map<String, Object> bsEnergyMonitor, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<BsEnergyMonitorEntity> queryWrapper = Condition.getQueryWrapper(bsEnergyMonitor, BsEnergyMonitorEntity.class);
+		List<BsEnergyMonitorExcel> list = bsEnergyMonitorService.exportBsEnergyMonitor(queryWrapper);
+		ExcelUtil.export(response, "能源监控表数据" + DateUtil.time(), "能源监控表数据表", list, BsEnergyMonitorExcel.class);
+	}
+
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsEnergyQuotaController.java

@@ -25,6 +25,7 @@
  */
 package org.springblade.desk.energy.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -71,61 +72,39 @@ public class BsEnergyQuotaController extends BladeController {
 	 * 能源定额 详情
 	 */
 	@GetMapping("/detail")
-	@ApiOperationSupport(order = 1)
 	@Operation(summary = "详情", description  = "传入bsEnergyQuota")
 	public R<BsEnergyQuotaVO> detail(BsEnergyQuotaEntity bsEnergyQuota) {
 		BsEnergyQuotaEntity detail = bsEnergyQuotaService.getOne(Condition.getQueryWrapper(bsEnergyQuota));
 		return R.data(BsEnergyQuotaWrapper.build().entityVO(detail));
 	}
-	/**
-	 * 能源定额 分页
-	 */
-	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
-	@Operation(summary = "分页", description  = "传入bsEnergyQuota")
-	public R<IPage<BsEnergyQuotaVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> bsEnergyQuota, Query query) {
-		IPage<BsEnergyQuotaEntity> pages = bsEnergyQuotaService.page(Condition.getPage(query), Condition.getQueryWrapper(bsEnergyQuota, BsEnergyQuotaEntity.class));
-		return R.data(BsEnergyQuotaWrapper.build().pageVO(pages));
-	}
 
 	/**
 	 * 能源定额 自定义分页
 	 */
 	@GetMapping("/page")
-	@ApiOperationSupport(order = 3)
 	@Operation(summary = "分页", description  = "传入bsEnergyQuota")
 	public R<IPage<BsEnergyQuotaVO>> page(BsEnergyQuotaVO bsEnergyQuota, Query query) {
 		IPage<BsEnergyQuotaVO> pages = bsEnergyQuotaService.selectBsEnergyQuotaPage(Condition.getPage(query), bsEnergyQuota);
 		return R.data(pages);
 	}
 
-	/**
-	 * 能源定额 新增
-	 */
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
-	@Operation(summary = "新增", description  = "传入bsEnergyQuota")
-	public R save(@Valid @RequestBody BsEnergyQuotaEntity bsEnergyQuota) {
-		return R.status(bsEnergyQuotaService.save(bsEnergyQuota));
-	}
-
-	/**
-	 * 能源定额 修改
-	 */
-	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
-	@Operation(summary = "修改", description  = "传入bsEnergyQuota")
-	public R update(@Valid @RequestBody BsEnergyQuotaEntity bsEnergyQuota) {
-		return R.status(bsEnergyQuotaService.updateById(bsEnergyQuota));
-	}
-
 	/**
 	 * 能源定额 新增或修改
 	 */
 	@PostMapping("/submit")
-	@ApiOperationSupport(order = 6)
 	@Operation(summary = "新增或修改", description  = "传入bsEnergyQuota")
 	public R submit(@Valid @RequestBody BsEnergyQuotaEntity bsEnergyQuota) {
+		if (bsEnergyQuota.getId() == null){
+			// 新增需要校验
+			BsEnergyQuotaEntity bsEnergyQuotaEntity = bsEnergyQuotaService.getOne(new LambdaQueryWrapper<BsEnergyQuotaEntity>()
+					.eq(BsEnergyQuotaEntity::getWorkCenterId, bsEnergyQuota.getWorkCenterId())
+					.eq(BsEnergyQuotaEntity::getEquipmentId, bsEnergyQuota.getEquipmentId())
+					.eq(BsEnergyQuotaEntity::getType, bsEnergyQuota.getType())
+					.eq(BsEnergyQuotaEntity::getDate, bsEnergyQuota.getDate()));
+			if (bsEnergyQuotaEntity != null) {
+				return R.fail("该日期能源定额已存在");
+			}
+		}
 		return R.status(bsEnergyQuotaService.saveOrUpdate(bsEnergyQuota));
 	}
 
@@ -133,26 +112,19 @@ public class BsEnergyQuotaController extends BladeController {
 	 * 能源定额 删除
 	 */
 	@PostMapping("/remove")
-	@ApiOperationSupport(order = 7)
 	@Operation(summary = "逻辑删除", description  = "传入ids")
 	public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(bsEnergyQuotaService.deleteLogic(Func.toLongList(ids)));
 	}
 
-
 	/**
 	 * 导出数据
 	 */
 	@IsAdmin
 	@GetMapping("/export-bsEnergyQuota")
-	@ApiOperationSupport(order = 9)
 	@Operation(summary = "导出数据", description  = "传入bsEnergyQuota")
 	public void exportBsEnergyQuota(@Parameter(hidden = true) @RequestParam Map<String, Object> bsEnergyQuota, BladeUser bladeUser, HttpServletResponse response) {
 		QueryWrapper<BsEnergyQuotaEntity> queryWrapper = Condition.getQueryWrapper(bsEnergyQuota, BsEnergyQuotaEntity.class);
-		//if (!AuthUtil.isAdministrator()) {
-		//	queryWrapper.lambda().eq(BsEnergyQuota::getTenantId, bladeUser.getTenantId());
-		//}
-		//queryWrapper.lambda().eq(BsEnergyQuotaEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
 		List<BsEnergyQuotaExcel> list = bsEnergyQuotaService.exportBsEnergyQuota(queryWrapper);
 		ExcelUtil.export(response, "能源定额数据" + DateUtil.time(), "能源定额数据表", list, BsEnergyQuotaExcel.class);
 	}

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsEnergyTargetController.java

@@ -25,6 +25,7 @@
  */
 package org.springblade.desk.energy.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -50,6 +51,7 @@ import org.springblade.desk.energy.service.IBsEnergyTargetService;
 import org.springblade.desk.energy.wrapper.BsEnergyTargetWrapper;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -71,61 +73,57 @@ public class BsEnergyTargetController extends BladeController {
 	 * 能耗目标表 详情
 	 */
 	@GetMapping("/detail")
-	@ApiOperationSupport(order = 1)
 	@Operation(summary = "详情", description  = "传入bsEnergyTarget")
 	public R<BsEnergyTargetVO> detail(BsEnergyTargetEntity bsEnergyTarget) {
 		BsEnergyTargetEntity detail = bsEnergyTargetService.getOne(Condition.getQueryWrapper(bsEnergyTarget));
 		return R.data(BsEnergyTargetWrapper.build().entityVO(detail));
 	}
+
 	/**
-	 * 能耗目标表 分页
+	 * 能耗目标表 获取用水目标
 	 */
-	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
-	@Operation(summary = "分页", description  = "传入bsEnergyTarget")
-	public R<IPage<BsEnergyTargetVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> bsEnergyTarget, Query query) {
-		IPage<BsEnergyTargetEntity> pages = bsEnergyTargetService.page(Condition.getPage(query), Condition.getQueryWrapper(bsEnergyTarget, BsEnergyTargetEntity.class));
-		return R.data(BsEnergyTargetWrapper.build().pageVO(pages));
+	@GetMapping("/detailByWater")
+	@Operation(summary = "详情", description  = "获取用水目标")
+	public R<BigDecimal> getWaterTargetByMonth(String month) {
+		BigDecimal waterTarget = bsEnergyTargetService.getWaterTargetByMonth(month);
+		return R.data(waterTarget);
+	}
+
+	/**
+	 * 能耗目标表 获取用水目标
+	 */
+	@GetMapping("/detailByElectric")
+	@Operation(summary = "详情", description  = "获取用水目标")
+	public R<BigDecimal> getElectricTargetByMonth(String month) {
+		BigDecimal electricTarget = bsEnergyTargetService.getElectricTargetByMonth(month);
+		return R.data(electricTarget);
 	}
 
 	/**
 	 * 能耗目标表 自定义分页
 	 */
 	@GetMapping("/page")
-	@ApiOperationSupport(order = 3)
 	@Operation(summary = "分页", description  = "传入bsEnergyTarget")
 	public R<IPage<BsEnergyTargetVO>> page(BsEnergyTargetVO bsEnergyTarget, Query query) {
 		IPage<BsEnergyTargetVO> pages = bsEnergyTargetService.selectBsEnergyTargetPage(Condition.getPage(query), bsEnergyTarget);
 		return R.data(pages);
 	}
 
-	/**
-	 * 能耗目标表 新增
-	 */
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
-	@Operation(summary = "新增", description  = "传入bsEnergyTarget")
-	public R save(@Valid @RequestBody BsEnergyTargetEntity bsEnergyTarget) {
-		return R.status(bsEnergyTargetService.save(bsEnergyTarget));
-	}
-
-	/**
-	 * 能耗目标表 修改
-	 */
-	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
-	@Operation(summary = "修改", description  = "传入bsEnergyTarget")
-	public R update(@Valid @RequestBody BsEnergyTargetEntity bsEnergyTarget) {
-		return R.status(bsEnergyTargetService.updateById(bsEnergyTarget));
-	}
-
 	/**
 	 * 能耗目标表 新增或修改
 	 */
 	@PostMapping("/submit")
-	@ApiOperationSupport(order = 6)
 	@Operation(summary = "新增或修改", description  = "传入bsEnergyTarget")
 	public R submit(@Valid @RequestBody BsEnergyTargetEntity bsEnergyTarget) {
+		if (bsEnergyTarget.getId() == null) {
+			// 新增需要校验
+			BsEnergyTargetEntity bsEnergyTargetEntity = bsEnergyTargetService.getOne(new LambdaQueryWrapper<BsEnergyTargetEntity>().
+					eq(BsEnergyTargetEntity::getMonth, bsEnergyTarget.getMonth())
+					.eq(BsEnergyTargetEntity::getType, bsEnergyTarget.getType()));
+			if (bsEnergyTargetEntity != null) {
+				return R.fail("该月份能耗目标已存在");
+			}
+		}
 		return R.status(bsEnergyTargetService.saveOrUpdate(bsEnergyTarget));
 	}
 
@@ -133,26 +131,19 @@ public class BsEnergyTargetController extends BladeController {
 	 * 能耗目标表 删除
 	 */
 	@PostMapping("/remove")
-	@ApiOperationSupport(order = 7)
 	@Operation(summary = "逻辑删除", description  = "传入ids")
 	public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(bsEnergyTargetService.deleteLogic(Func.toLongList(ids)));
 	}
 
-
 	/**
 	 * 导出数据
 	 */
 	@IsAdmin
 	@GetMapping("/export-bsEnergyTarget")
-	@ApiOperationSupport(order = 9)
 	@Operation(summary = "导出数据", description  = "传入bsEnergyTarget")
 	public void exportBsEnergyTarget(@Parameter(hidden = true) @RequestParam Map<String, Object> bsEnergyTarget, BladeUser bladeUser, HttpServletResponse response) {
 		QueryWrapper<BsEnergyTargetEntity> queryWrapper = Condition.getQueryWrapper(bsEnergyTarget, BsEnergyTargetEntity.class);
-		//if (!AuthUtil.isAdministrator()) {
-		//	queryWrapper.lambda().eq(BsEnergyTarget::getTenantId, bladeUser.getTenantId());
-		//}
-		//queryWrapper.lambda().eq(BsEnergyTargetEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
 		List<BsEnergyTargetExcel> list = bsEnergyTargetService.exportBsEnergyTarget(queryWrapper);
 		ExcelUtil.export(response, "能耗目标表数据" + DateUtil.time(), "能耗目标表数据表", list, BsEnergyTargetExcel.class);
 	}

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsPeakFlatValleyController.java

@@ -0,0 +1,130 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.desk.energy.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.annotation.IsAdmin;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.desk.energy.excel.BsPeakFlatValleyExcel;
+import org.springblade.desk.energy.pojo.entity.BsPeakFlatValleyEntity;
+import org.springblade.desk.energy.pojo.vo.BsPeakFlatValleyVO;
+import org.springblade.desk.energy.service.IBsPeakFlatValleyService;
+import org.springblade.desk.energy.wrapper.BsPeakFlatValleyWrapper;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 峰平谷 控制器
+ *
+ * @author BladeX
+ * @since 2026-03-03
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/bsPeakFlatValley")
+@Tag(name = "峰平谷", description = "峰平谷接口")
+public class BsPeakFlatValleyController extends BladeController {
+
+	private final IBsPeakFlatValleyService bsPeakFlatValleyService;
+
+	/**
+	 * 峰平谷 详情
+	 */
+	@GetMapping("/detail")
+	@Operation(summary = "详情", description  = "传入bsPeakFlatValley")
+	public R<BsPeakFlatValleyVO> detail(BsPeakFlatValleyEntity bsPeakFlatValley) {
+		BsPeakFlatValleyEntity detail = bsPeakFlatValleyService.getOne(Condition.getQueryWrapper(bsPeakFlatValley));
+		return R.data(BsPeakFlatValleyWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 峰平谷 自定义分页
+	 */
+	@GetMapping("/page")
+	@Operation(summary = "分页", description  = "传入bsPeakFlatValley")
+	public R<IPage<BsPeakFlatValleyVO>> page(BsPeakFlatValleyVO bsPeakFlatValley, Query query) {
+		IPage<BsPeakFlatValleyVO> pages = bsPeakFlatValleyService.selectBsPeakFlatValleyPage(Condition.getPage(query), bsPeakFlatValley);
+		return R.data(pages);
+	}
+
+	/**
+	 * 峰平谷 新增或修改
+	 */
+	@PostMapping("/submit")
+	@Operation(summary = "新增或修改", description  = "传入bsPeakFlatValley")
+	public R submit(@Valid @RequestBody BsPeakFlatValleyEntity bsPeakFlatValley) {
+		if (bsPeakFlatValley.getId() == null){
+			// 新增校验是否存在
+			BsPeakFlatValleyEntity bsPeakFlatValleyEntity = bsPeakFlatValleyService.getOne(new LambdaQueryWrapper<BsPeakFlatValleyEntity>()
+					.eq(BsPeakFlatValleyEntity::getMonth, bsPeakFlatValley.getMonth()));
+			if (bsPeakFlatValleyEntity != null) {
+				return R.fail("该月份峰平谷已存在");
+			}
+		}
+		return R.status(bsPeakFlatValleyService.saveOrUpdate(bsPeakFlatValley));
+	}
+
+	/**
+	 * 峰平谷 删除
+	 */
+	@PostMapping("/remove")
+	@Operation(summary = "逻辑删除", description  = "传入ids")
+	public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(bsPeakFlatValleyService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	/**
+	 * 导出数据
+	 */
+	@IsAdmin
+	@GetMapping("/export-bsPeakFlatValley")
+	@ApiOperationSupport(order = 9)
+	@Operation(summary = "导出数据", description  = "传入bsPeakFlatValley")
+	public void exportBsPeakFlatValley(@Parameter(hidden = true) @RequestParam Map<String, Object> bsPeakFlatValley, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<BsPeakFlatValleyEntity> queryWrapper = Condition.getQueryWrapper(bsPeakFlatValley, BsPeakFlatValleyEntity.class);
+		List<BsPeakFlatValleyExcel> list = bsPeakFlatValleyService.exportBsPeakFlatValley(queryWrapper);
+		ExcelUtil.export(response, "峰平谷数据" + DateUtil.time(), "峰平谷数据表", list, BsPeakFlatValleyExcel.class);
+	}
+
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsEnergyMonitorExcel.java

@@ -0,0 +1,159 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.desk.energy.excel;
+
+
+import lombok.Data;
+
+import java.util.Date;
+import java.math.BigDecimal;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+import java.io.Serial;
+
+
+/**
+ * 能源监控表 Excel实体类
+ *
+ * @author BladeX
+ * @since 2026-03-03
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class BsEnergyMonitorExcel implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * ID
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("ID")
+	private Long id;
+	/**
+	 * 月份
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("月份")
+	private Date month;
+	/**
+	 * 上月用水
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("上月用水")
+	private BigDecimal lastWater;
+	/**
+	 * 上月用电
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("上月用电")
+	private BigDecimal lastElectric;
+	/**
+	 * 上月产能
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("上月产能")
+	private BigDecimal lastOutput;
+	/**
+	 * 上月用水
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("上月用水")
+	private BigDecimal currentWater;
+	/**
+	 * 上月用电
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("上月用电")
+	private BigDecimal currentElectric;
+	/**
+	 * 上月产能
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("上月产能")
+	private BigDecimal currentOutput;
+	/**
+	 * 上月用水目标
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("上月用水目标")
+	private BigDecimal lastWaterTarget;
+	/**
+	 * 上月用电目标
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("上月用电目标")
+	private BigDecimal lastElectricTarget;
+	/**
+	 * 是否已删除
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否已删除")
+	private Long isDeleted;
+	/**
+	 * 本月用水目标
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("本月用水目标")
+	private BigDecimal currentWaterTarget;
+	/**
+	 * 本月用电目标
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("本月用电目标")
+	private BigDecimal currentElectricTarget;
+	/**
+	 * 上月用水实际完成
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("上月用水实际完成")
+	private BigDecimal lastWaterRate;
+	/**
+	 * 上月用电实际完成
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("上月用电实际完成")
+	private BigDecimal lastElectricRate;
+	/**
+	 * 本月用水实际完成
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("本月用水实际完成")
+	private BigDecimal currentWaterRate;
+	/**
+	 * 本月用电实际完成
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("本月用电实际完成")
+	private BigDecimal currentElectricRate;
+
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsPeakFlatValleyExcel.java

@@ -0,0 +1,158 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.desk.energy.excel;
+
+
+import lombok.Data;
+
+import java.util.Date;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+import java.io.Serial;
+
+
+/**
+ * 峰平谷 Excel实体类
+ *
+ * @author BladeX
+ * @since 2026-03-03
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class BsPeakFlatValleyExcel implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * ID
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("ID")
+	private Long id;
+	/**
+	 * 月份
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("月份")
+	private Date month;
+	/**
+	 * 尖时一开始时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("尖时一开始时间")
+	private String sharpOneStartTime;
+	/**
+	 * 尖时一结束时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("尖时一结束时间")
+	private String sharpOneEndTime;
+	/**
+	 * 峰时一开始时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("峰时一开始时间")
+	private String peakOneStartTime;
+	/**
+	 * 峰时一结束时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("峰时一结束时间")
+	private String peakOneEndTime;
+	/**
+	 * 平时一开始时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("平时一开始时间")
+	private String flatOneStartTime;
+	/**
+	 * 平时一结束时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("平时一结束时间")
+	private String flatOneEndTime;
+	/**
+	 * 谷时一开始时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("谷时一开始时间")
+	private String valleyOneStartTime;
+	/**
+	 * 谷时一结束时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("谷时一结束时间")
+	private String valleyOneEndTime;
+	/**
+	 * 尖时二开始时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("尖时二开始时间")
+	private String sharpTwoStartTime;
+	/**
+	 * 尖时二结束时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("尖时二结束时间")
+	private String sharpTwoEndTime;
+	/**
+	 * 峰时二开始时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("峰时二开始时间")
+	private String peakTwoStartTime;
+	/**
+	 * 峰时二结束时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("峰时二结束时间")
+	private String peakTwoEndTime;
+	/**
+	 * 平时二开始时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("平时二开始时间")
+	private String flatTwoStartTime;
+	/**
+	 * 平时二结束时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("平时二结束时间")
+	private String flatTwoEndTime;
+	/**
+	 * 是否已删除
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否已删除")
+	private Long isDeleted;
+
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsEnergyMonitorMapper.java

@@ -0,0 +1,63 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.desk.energy.mapper;
+
+import org.springblade.desk.energy.pojo.entity.BsEnergyMonitorEntity;
+import org.springblade.desk.energy.pojo.vo.BsEnergyMonitorVO;
+import org.springblade.desk.energy.excel.BsEnergyMonitorExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 能源监控表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2026-03-03
+ */
+public interface BsEnergyMonitorMapper extends BaseMapper<BsEnergyMonitorEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page 分页参数
+	 * @param bsEnergyMonitor 查询参数
+	 * @return List<BsEnergyMonitorVO>
+	 */
+	List<BsEnergyMonitorVO> selectBsEnergyMonitorPage(IPage page, BsEnergyMonitorVO bsEnergyMonitor);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper 查询条件
+	 * @return List<BsEnergyMonitorExcel>
+	 */
+	List<BsEnergyMonitorExcel> exportBsEnergyMonitor(@Param("ew") Wrapper<BsEnergyMonitorEntity> queryWrapper);
+
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsPeakFlatValleyMapper.java

@@ -0,0 +1,63 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.desk.energy.mapper;
+
+import org.springblade.desk.energy.pojo.entity.BsPeakFlatValleyEntity;
+import org.springblade.desk.energy.pojo.vo.BsPeakFlatValleyVO;
+import org.springblade.desk.energy.excel.BsPeakFlatValleyExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 峰平谷 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2026-03-03
+ */
+public interface BsPeakFlatValleyMapper extends BaseMapper<BsPeakFlatValleyEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page 分页参数
+	 * @param bsPeakFlatValley 查询参数
+	 * @return List<BsPeakFlatValleyVO>
+	 */
+	List<BsPeakFlatValleyVO> selectBsPeakFlatValleyPage(IPage page, BsPeakFlatValleyVO bsPeakFlatValley);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper 查询条件
+	 * @return List<BsPeakFlatValleyExcel>
+	 */
+	List<BsPeakFlatValleyExcel> exportBsPeakFlatValley(@Param("ew") Wrapper<BsPeakFlatValleyEntity> queryWrapper);
+
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyMonitorMapper.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.desk.energy.mapper.BsEnergyMonitorMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="bsEnergyMonitorResultMap" type="org.springblade.desk.energy.pojo.entity.BsEnergyMonitorEntity">
+        <result column="ID" property="id"/>
+        <result column="MONTH" property="month"/>
+        <result column="LAST_WATER" property="lastWater"/>
+        <result column="LAST_ELECTRIC" property="lastElectric"/>
+        <result column="LAST_OUTPUT" property="lastOutput"/>
+        <result column="CURRENT_WATER" property="currentWater"/>
+        <result column="CURRENT_ELECTRIC" property="currentElectric"/>
+        <result column="CURRENT_OUTPUT" property="currentOutput"/>
+        <result column="LAST_WATER_TARGET" property="lastWaterTarget"/>
+        <result column="LAST_ELECTRIC_TARGET" property="lastElectricTarget"/>
+        <result column="CREATE_USER" property="createUser"/>
+        <result column="CREATE_DEPT" property="createDept"/>
+        <result column="CREATE_TIME" property="createTime"/>
+        <result column="UPDATE_USER" property="updateUser"/>
+        <result column="UPDATE_TIME" property="updateTime"/>
+        <result column="STATUS" property="status"/>
+        <result column="IS_DELETED" property="isDeleted"/>
+        <result column="CURRENT_WATER_TARGET" property="currentWaterTarget"/>
+        <result column="CURRENT_ELECTRIC_TARGET" property="currentElectricTarget"/>
+        <result column="LAST_WATER_RATE" property="lastWaterRate"/>
+        <result column="LAST_ELECTRIC_RATE" property="lastElectricRate"/>
+        <result column="CURRENT_WATER_RATE" property="currentWaterRate"/>
+        <result column="CURRENT_ELECTRIC_RATE" property="currentElectricRate"/>
+    </resultMap>
+
+
+    <select id="selectBsEnergyMonitorPage" resultMap="bsEnergyMonitorResultMap">
+        select * from BS_ENERGY_MONITOR where is_deleted = 0
+    </select>
+
+
+    <select id="exportBsEnergyMonitor" resultType="org.springblade.desk.energy.excel.BsEnergyMonitorExcel">
+        SELECT * FROM BS_ENERGY_MONITOR ${ew.customSqlSegment}
+    </select>
+
+</mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/PeakFlatValleyMapper.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.desk.energy.mapper.BsPeakFlatValleyMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="bsPeakFlatValleyResultMap" type="org.springblade.desk.energy.pojo.entity.BsPeakFlatValleyEntity">
+        <result column="ID" property="id"/>
+        <result column="MONTH" property="month"/>
+        <result column="SHARP_ONE_START_TIME" property="sharpOneStartTime"/>
+        <result column="SHARP_ONE_END_TIME" property="sharpOneEndTime"/>
+        <result column="PEAK_ONE_START_TIME" property="peakOneStartTime"/>
+        <result column="PEAK_ONE_END_TIME" property="peakOneEndTime"/>
+        <result column="FLAT_ONE_START_TIME" property="flatOneStartTime"/>
+        <result column="FLAT_ONE_END_TIME" property="flatOneEndTime"/>
+        <result column="VALLEY_ONE_START_TIME" property="valleyOneStartTime"/>
+        <result column="VALLEY_ONE_END_TIME" property="valleyOneEndTime"/>
+        <result column="SHARP_TWO_START_TIME" property="sharpTwoStartTime"/>
+        <result column="SHARP_TWO_END_TIME" property="sharpTwoEndTime"/>
+        <result column="PEAK_TWO_START_TIME" property="peakTwoStartTime"/>
+        <result column="PEAK_TWO_END_TIME" property="peakTwoEndTime"/>
+        <result column="FLAT_TWO_START_TIME" property="flatTwoStartTime"/>
+        <result column="FLAT_TWO_END_TIME" property="flatTwoEndTime"/>
+        <result column="CREATE_USER" property="createUser"/>
+        <result column="CREATE_DEPT" property="createDept"/>
+        <result column="CREATE_TIME" property="createTime"/>
+        <result column="UPDATE_USER" property="updateUser"/>
+        <result column="UPDATE_TIME" property="updateTime"/>
+        <result column="STATUS" property="status"/>
+        <result column="IS_DELETED" property="isDeleted"/>
+    </resultMap>
+
+
+    <select id="selectBsPeakFlatValleyPage" resultMap="bsPeakFlatValleyResultMap">
+        select * from BS_PEAK_FLAT_VALLEY where is_deleted = 0
+    </select>
+
+
+    <select id="exportBsPeakFlatValley" resultType="org.springblade.desk.energy.excel.BsPeakFlatValleyExcel">
+        SELECT * FROM BS_PEAK_FLAT_VALLEY ${ew.customSqlSegment}
+    </select>
+
+</mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsEnergyMonitorDTO.java

@@ -0,0 +1,45 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.desk.energy.pojo.dto;
+
+import org.springblade.desk.energy.pojo.entity.BsEnergyMonitorEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serial;
+
+/**
+ * 能源监控表 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2026-03-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BsEnergyMonitorDTO extends BsEnergyMonitorEntity {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsPeakFlatValleyDTO.java

@@ -0,0 +1,45 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.desk.energy.pojo.dto;
+
+import org.springblade.desk.energy.pojo.entity.BsPeakFlatValleyEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serial;
+
+/**
+ * 峰平谷 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2026-03-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BsPeakFlatValleyDTO extends BsPeakFlatValleyEntity {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsEnergyMonitorEntity.java

@@ -0,0 +1,128 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.desk.energy.pojo.entity;
+
+import lombok.Data;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import java.math.BigDecimal;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+import java.io.Serial;
+
+/**
+ * 能源监控表 实体类
+ *
+ * @author BladeX
+ * @since 2026-03-03
+ */
+@Data
+@TableName("BS_ENERGY_MONITOR")
+@Schema(description = "BsEnergyMonitor对象")
+@EqualsAndHashCode(callSuper = true)
+public class BsEnergyMonitorEntity extends TenantEntity {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 月份
+	 */
+	@Schema(description = "月份")
+	private Date month;
+	/**
+	 * 上月用水
+	 */
+	@Schema(description = "上月用水")
+	private BigDecimal lastWater;
+	/**
+	 * 上月用电
+	 */
+	@Schema(description = "上月用电")
+	private BigDecimal lastElectric;
+	/**
+	 * 上月产能
+	 */
+	@Schema(description = "上月产能")
+	private BigDecimal lastOutput;
+	/**
+	 * 上月用水
+	 */
+	@Schema(description = "上月用水")
+	private BigDecimal currentWater;
+	/**
+	 * 上月用电
+	 */
+	@Schema(description = "上月用电")
+	private BigDecimal currentElectric;
+	/**
+	 * 上月产能
+	 */
+	@Schema(description = "上月产能")
+	private BigDecimal currentOutput;
+	/**
+	 * 上月用水目标
+	 */
+	@Schema(description = "上月用水目标")
+	private BigDecimal lastWaterTarget;
+	/**
+	 * 上月用电目标
+	 */
+	@Schema(description = "上月用电目标")
+	private BigDecimal lastElectricTarget;
+	/**
+	 * 本月用水目标
+	 */
+	@Schema(description = "本月用水目标")
+	private BigDecimal currentWaterTarget;
+	/**
+	 * 本月用电目标
+	 */
+	@Schema(description = "本月用电目标")
+	private BigDecimal currentElectricTarget;
+	/**
+	 * 上月用水实际完成
+	 */
+	@Schema(description = "上月用水实际完成")
+	private BigDecimal lastWaterRate;
+	/**
+	 * 上月用电实际完成
+	 */
+	@Schema(description = "上月用电实际完成")
+	private BigDecimal lastElectricRate;
+	/**
+	 * 本月用水实际完成
+	 */
+	@Schema(description = "本月用水实际完成")
+	private BigDecimal currentWaterRate;
+	/**
+	 * 本月用电实际完成
+	 */
+	@Schema(description = "本月用电实际完成")
+	private BigDecimal currentElectricRate;
+
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsEnergyQuotaEntity.java

@@ -25,14 +25,14 @@
  */
 package org.springblade.desk.energy.pojo.entity;
 
-import lombok.Data;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
-import org.springblade.core.tenant.mp.TenantEntity;
+
 import java.io.Serial;
+import java.util.Date;
 
 /**
  * 能源定额 实体类
@@ -59,21 +59,26 @@ public class BsEnergyQuotaEntity extends BaseEntity {
 	 */
 	@Schema(description = "作业中心ID")
 	private Long workCenterId;
+	/**
+	 * 作业中心名称
+	 */
+	@Schema(description = "作业中心名称")
+	private String workCenterName;
 	/**
 	 * 设备ID
 	 */
 	@Schema(description = "设备ID")
 	private Long equipmentId;
 	/**
-	 * 月份
+	 * 设备名称
 	 */
-	@Schema(description = "月份")
-	private String month;
+	@Schema(description = "设备名称")
+	private String equipmentName;
 	/**
 	 * 日期
 	 */
 	@Schema(description = "日期")
-	private String date;
+	private Date date;
 	/**
 	 * 自来水用水量
 	 */

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsEnergyTargetEntity.java

@@ -25,15 +25,15 @@
  */
 package org.springblade.desk.energy.pojo.entity;
 
-import lombok.Data;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.math.BigDecimal;
-import java.util.Date;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
-import org.springblade.core.tenant.mp.TenantEntity;
+
 import java.io.Serial;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 能耗目标表 实体类
@@ -59,7 +59,12 @@ public class BsEnergyTargetEntity extends BaseEntity {
 	 * 月份
 	 */
 	@Schema(description = "月份")
-	private String month;
+	private Date month;
+	/**
+	 * 年
+	 */
+	@Schema(description = "年")
+	private Date year;
 	/**
 	 * 日期
 	 */
@@ -69,6 +74,10 @@ public class BsEnergyTargetEntity extends BaseEntity {
 	 * 目标
 	 */
 	@Schema(description = "目标")
-	private Long target;
-
+	private BigDecimal target;
+	/**
+	 * 季度
+	 */
+	@Schema(description = "季度")
+	private String quarter;
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsPeakFlatValleyEntity.java

@@ -0,0 +1,137 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.desk.energy.pojo.entity;
+
+import lombok.Data;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+import org.springblade.core.tenant.mp.TenantEntity;
+import java.io.Serial;
+
+/**
+ * 峰平谷 实体类
+ *
+ * @author BladeX
+ * @since 2026-03-03
+ */
+@Data
+@TableName("BS_PEAK_FLAT_VALLEY")
+@Schema(description = "BsPeakFlatValley对象")
+@EqualsAndHashCode(callSuper = true)
+public class BsPeakFlatValleyEntity extends BaseEntity {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 月份
+	 */
+	@Schema(description = "月份")
+	private Date month;
+	/**
+	 * 尖时一开始时间
+	 */
+	@Schema(description = "尖时一开始时间")
+	private String sharpOneStartTime;
+	/**
+	 * 尖时一结束时间
+	 */
+	@Schema(description = "尖时一结束时间")
+	private String sharpOneEndTime;
+	/**
+	 * 峰时一开始时间
+	 */
+	@Schema(description = "峰时一开始时间")
+	private String peakOneStartTime;
+	/**
+	 * 峰时一结束时间
+	 */
+	@Schema(description = "峰时一结束时间")
+	private String peakOneEndTime;
+	/**
+	 * 平时一开始时间
+	 */
+	@Schema(description = "平时一开始时间")
+	private String flatOneStartTime;
+	/**
+	 * 平时一结束时间
+	 */
+	@Schema(description = "平时一结束时间")
+	private String flatOneEndTime;
+	/**
+	 * 谷时一开始时间
+	 */
+	@Schema(description = "谷时一开始时间")
+	private String valleyOneStartTime;
+	/**
+	 * 谷时一结束时间
+	 */
+	@Schema(description = "谷时一结束时间")
+	private String valleyOneEndTime;
+	/**
+	 * 尖时二开始时间
+	 */
+	@Schema(description = "尖时二开始时间")
+	private String sharpTwoStartTime;
+	/**
+	 * 尖时二结束时间
+	 */
+	@Schema(description = "尖时二结束时间")
+	private String sharpTwoEndTime;
+	/**
+	 * 峰时二开始时间
+	 */
+	@Schema(description = "峰时二开始时间")
+	private String peakTwoStartTime;
+	/**
+	 * 峰时二结束时间
+	 */
+	@Schema(description = "峰时二结束时间")
+	private String peakTwoEndTime;
+	/**
+	 * 平时二开始时间
+	 */
+	@Schema(description = "平时二开始时间")
+	private String flatTwoStartTime;
+	/**
+	 * 平时二结束时间
+	 */
+	@Schema(description = "平时二结束时间")
+	private String flatTwoEndTime;
+	/**
+	 * 谷时二开始时间
+	 */
+	@Schema(description = "谷时二开始时间")
+	private String valleyTwoStartTime;
+	/**
+	 * 谷时二结束时间
+	 */
+	@Schema(description = "谷时二结束时间")
+	private String valleyTwoEndTime;
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyMonitorVO.java

@@ -0,0 +1,45 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.desk.energy.pojo.vo;
+
+import org.springblade.desk.energy.pojo.entity.BsEnergyMonitorEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serial;
+
+/**
+ * 能源监控表 视图实体类
+ *
+ * @author BladeX
+ * @since 2026-03-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BsEnergyMonitorVO extends BsEnergyMonitorEntity {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyQuotaVO.java

@@ -42,13 +42,4 @@ public class BsEnergyQuotaVO extends BsEnergyQuotaEntity {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * 作业中心名称
-	 */
-	private String workCenterName;
-
-	/**
-	 * 设备名称
-	 */
-	private String equipmentName;
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsPeakFlatValleyVO.java

@@ -0,0 +1,45 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.desk.energy.pojo.vo;
+
+import org.springblade.desk.energy.pojo.entity.BsPeakFlatValleyEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serial;
+
+/**
+ * 峰平谷 视图实体类
+ *
+ * @author BladeX
+ * @since 2026-03-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BsPeakFlatValleyVO extends BsPeakFlatValleyEntity {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEnergyMonitorService.java

@@ -0,0 +1,61 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.desk.energy.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import org.springblade.desk.energy.pojo.entity.BsEnergyMonitorEntity;
+import org.springblade.desk.energy.pojo.vo.BsEnergyMonitorVO;
+import org.springblade.desk.energy.excel.BsEnergyMonitorExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 能源监控表 服务类
+ *
+ * @author BladeX
+ * @since 2026-03-03
+ */
+public interface IBsEnergyMonitorService extends BaseService<BsEnergyMonitorEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page 分页参数
+	 * @param bsEnergyMonitor 查询参数
+	 * @return IPage<BsEnergyMonitorVO>
+	 */
+	IPage<BsEnergyMonitorVO> selectBsEnergyMonitorPage(IPage<BsEnergyMonitorVO> page, BsEnergyMonitorVO bsEnergyMonitor);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper 查询条件
+	 * @return List<BsEnergyMonitorExcel>
+	 */
+	List<BsEnergyMonitorExcel> exportBsEnergyMonitor(Wrapper<BsEnergyMonitorEntity> queryWrapper);
+
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEnergyTargetService.java

@@ -31,6 +31,8 @@ import org.springblade.desk.energy.pojo.vo.BsEnergyTargetVO;
 import org.springblade.desk.energy.excel.BsEnergyTargetExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
+
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -58,4 +60,17 @@ public interface IBsEnergyTargetService extends BaseService<BsEnergyTargetEntity
 	 */
 	List<BsEnergyTargetExcel> exportBsEnergyTarget(Wrapper<BsEnergyTargetEntity> queryWrapper);
 
+	/**
+	 * 根据月份获取用水目标
+	 * @param month 月份
+	 * @return 用水目标
+	 */
+	BigDecimal getWaterTargetByMonth(String month);
+
+	/**
+	 * 根据月份获取用电目标
+	 * @param month 月份
+	 * @return 用电目标
+	 */
+	BigDecimal getElectricTargetByMonth(String month);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsPeakFlatValleyService.java

@@ -0,0 +1,61 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.desk.energy.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import org.springblade.desk.energy.pojo.entity.BsPeakFlatValleyEntity;
+import org.springblade.desk.energy.pojo.vo.BsPeakFlatValleyVO;
+import org.springblade.desk.energy.excel.BsPeakFlatValleyExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 峰平谷 服务类
+ *
+ * @author BladeX
+ * @since 2026-03-03
+ */
+public interface IBsPeakFlatValleyService extends BaseService<BsPeakFlatValleyEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page 分页参数
+	 * @param bsPeakFlatValley 查询参数
+	 * @return IPage<BsPeakFlatValleyVO>
+	 */
+	IPage<BsPeakFlatValleyVO> selectBsPeakFlatValleyPage(IPage<BsPeakFlatValleyVO> page, BsPeakFlatValleyVO bsPeakFlatValley);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper 查询条件
+	 * @return List<BsPeakFlatValleyExcel>
+	 */
+	List<BsPeakFlatValleyExcel> exportBsPeakFlatValley(Wrapper<BsPeakFlatValleyEntity> queryWrapper);
+
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEnergyMonitorServiceImpl.java

@@ -0,0 +1,63 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.desk.energy.service.impl;
+
+import org.springblade.desk.energy.pojo.entity.BsEnergyMonitorEntity;
+import org.springblade.desk.energy.pojo.vo.BsEnergyMonitorVO;
+import org.springblade.desk.energy.excel.BsEnergyMonitorExcel;
+import org.springblade.desk.energy.mapper.BsEnergyMonitorMapper;
+import org.springblade.desk.energy.service.IBsEnergyMonitorService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 能源监控表 服务实现类
+ *
+ * @author BladeX
+ * @since 2026-03-03
+ */
+@Service
+public class BsEnergyMonitorServiceImpl extends BaseServiceImpl<BsEnergyMonitorMapper, BsEnergyMonitorEntity> implements IBsEnergyMonitorService {
+
+	@Override
+	public IPage<BsEnergyMonitorVO> selectBsEnergyMonitorPage(IPage<BsEnergyMonitorVO> page, BsEnergyMonitorVO bsEnergyMonitor) {
+		return page.setRecords(baseMapper.selectBsEnergyMonitorPage(page, bsEnergyMonitor));
+	}
+
+
+	@Override
+	public List<BsEnergyMonitorExcel> exportBsEnergyMonitor(Wrapper<BsEnergyMonitorEntity> queryWrapper) {
+		List<BsEnergyMonitorExcel> bsEnergyMonitorList = baseMapper.exportBsEnergyMonitor(queryWrapper);
+		//bsEnergyMonitorList.forEach(bsEnergyMonitor -> {
+		//	bsEnergyMonitor.setTypeName(DictCache.getValue(DictEnum.YES_NO, BsEnergyMonitor.getType()));
+		//});
+		return bsEnergyMonitorList;
+	}
+
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEnergyTargetServiceImpl.java

@@ -25,6 +25,8 @@
  */
 package org.springblade.desk.energy.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.springblade.desk.dashboard.utils.DateUtils;
 import org.springblade.desk.energy.pojo.entity.BsEnergyTargetEntity;
 import org.springblade.desk.energy.pojo.vo.BsEnergyTargetVO;
 import org.springblade.desk.energy.excel.BsEnergyTargetExcel;
@@ -34,6 +36,8 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
+
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -60,4 +64,26 @@ public class BsEnergyTargetServiceImpl extends BaseServiceImpl<BsEnergyTargetMap
 		return bsEnergyTargetList;
 	}
 
+	@Override
+	public BigDecimal getWaterTargetByMonth(String month) {
+		BsEnergyTargetEntity energyTargetEntity = this.getOne(new LambdaQueryWrapper<BsEnergyTargetEntity>()
+				.eq(BsEnergyTargetEntity::getMonth, month));
+		if(energyTargetEntity != null){
+			return energyTargetEntity.getTarget();
+		}
+		return new BigDecimal(0);
+	}
+
+	@Override
+	public BigDecimal getElectricTargetByMonth(String month) {
+		String year = month.substring(0, 4);
+		int quarter = DateUtils.getQuarter(Integer.parseInt(month.substring(5, 7)));
+		BsEnergyTargetEntity energyTargetEntity = this.getOne(new LambdaQueryWrapper<BsEnergyTargetEntity>()
+				.eq(BsEnergyTargetEntity::getYear, year)
+				.eq(BsEnergyTargetEntity::getQuarter, quarter));
+		if (energyTargetEntity != null) {
+			return energyTargetEntity.getTarget();
+		}
+		return new BigDecimal(0);
+	}
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsPeakFlatValleyServiceImpl.java

@@ -0,0 +1,63 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.desk.energy.service.impl;
+
+import org.springblade.desk.energy.pojo.entity.BsPeakFlatValleyEntity;
+import org.springblade.desk.energy.pojo.vo.BsPeakFlatValleyVO;
+import org.springblade.desk.energy.excel.BsPeakFlatValleyExcel;
+import org.springblade.desk.energy.mapper.BsPeakFlatValleyMapper;
+import org.springblade.desk.energy.service.IBsPeakFlatValleyService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 峰平谷 服务实现类
+ *
+ * @author BladeX
+ * @since 2026-03-03
+ */
+@Service
+public class BsPeakFlatValleyServiceImpl extends BaseServiceImpl<BsPeakFlatValleyMapper, BsPeakFlatValleyEntity> implements IBsPeakFlatValleyService {
+
+	@Override
+	public IPage<BsPeakFlatValleyVO> selectBsPeakFlatValleyPage(IPage<BsPeakFlatValleyVO> page, BsPeakFlatValleyVO bsPeakFlatValley) {
+		return page.setRecords(baseMapper.selectBsPeakFlatValleyPage(page, bsPeakFlatValley));
+	}
+
+
+	@Override
+	public List<BsPeakFlatValleyExcel> exportBsPeakFlatValley(Wrapper<BsPeakFlatValleyEntity> queryWrapper) {
+		List<BsPeakFlatValleyExcel> bsPeakFlatValleyList = baseMapper.exportBsPeakFlatValley(queryWrapper);
+		//bsPeakFlatValleyList.forEach(bsPeakFlatValley -> {
+		//	bsPeakFlatValley.setTypeName(DictCache.getValue(DictEnum.YES_NO, BsPeakFlatValley.getType()));
+		//});
+		return bsPeakFlatValleyList;
+	}
+
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsEnergyMonitorWrapper.java

@@ -0,0 +1,59 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.desk.energy.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.desk.energy.pojo.entity.BsEnergyMonitorEntity;
+import org.springblade.desk.energy.pojo.vo.BsEnergyMonitorVO;
+import java.util.Objects;
+
+/**
+ * 能源监控表 包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2026-03-03
+ */
+public class BsEnergyMonitorWrapper extends BaseEntityWrapper<BsEnergyMonitorEntity, BsEnergyMonitorVO>  {
+
+	public static BsEnergyMonitorWrapper build() {
+		return new BsEnergyMonitorWrapper();
+ 	}
+
+	@Override
+	public BsEnergyMonitorVO entityVO(BsEnergyMonitorEntity bsEnergyMonitor) {
+		BsEnergyMonitorVO bsEnergyMonitorVO = Objects.requireNonNull(BeanUtil.copyProperties(bsEnergyMonitor, BsEnergyMonitorVO.class));
+
+		//User createUser = UserCache.getUser(bsEnergyMonitor.getCreateUser());
+		//User updateUser = UserCache.getUser(bsEnergyMonitor.getUpdateUser());
+		//bsEnergyMonitorVO.setCreateUserName(createUser.getName());
+		//bsEnergyMonitorVO.setUpdateUserName(updateUser.getName());
+
+		return bsEnergyMonitorVO;
+	}
+
+
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsEnergyQuotaWrapper.java

@@ -25,17 +25,12 @@
  */
 package org.springblade.desk.energy.wrapper;
 
-import jakarta.annotation.Resource;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.desk.basic.pojo.entity.WorkCenter;
-import org.springblade.desk.basic.service.IWorkCenterService;
-import org.springblade.desk.device.pojo.entity.EquipmentEntity;
-import org.springblade.desk.device.service.IEquipmentService;
 import org.springblade.desk.energy.pojo.entity.BsEnergyQuotaEntity;
 import org.springblade.desk.energy.pojo.vo.BsEnergyQuotaVO;
+
 import java.util.Objects;
-import java.util.Optional;
 
 /**
  * 能源定额 包装类,返回视图层所需的字段
@@ -45,29 +40,13 @@ import java.util.Optional;
  */
 public class BsEnergyQuotaWrapper extends BaseEntityWrapper<BsEnergyQuotaEntity, BsEnergyQuotaVO>  {
 
-	@Resource
-	private IWorkCenterService iWorkCenterService;
-
-	@Resource
-	private IEquipmentService iEquipmentService;
-
 	public static BsEnergyQuotaWrapper build() {
 		return new BsEnergyQuotaWrapper();
  	}
 
 	@Override
 	public BsEnergyQuotaVO entityVO(BsEnergyQuotaEntity bsEnergyQuota) {
-		BsEnergyQuotaVO bsEnergyQuotaVO = Objects.requireNonNull(BeanUtil.copyProperties(bsEnergyQuota, BsEnergyQuotaVO.class));
-		WorkCenter workCenter = iWorkCenterService.getById(bsEnergyQuota.getWorkCenterId());
-		if (workCenter != null) {
-			bsEnergyQuotaVO.setWorkCenterName(workCenter.getWcName());
-		}
-		EquipmentEntity equipmentEntity = iEquipmentService.getById(bsEnergyQuota.getEquipmentId());
-		if (equipmentEntity != null) {
-			bsEnergyQuotaVO.setEquipmentName(equipmentEntity.getDeviceName());
-		}
-		return bsEnergyQuotaVO;
+		return Objects.requireNonNull(BeanUtil.copyProperties(bsEnergyQuota, BsEnergyQuotaVO.class));
 	}
 
-
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsPeakFlatValleyWrapper.java

@@ -0,0 +1,59 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.desk.energy.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.desk.energy.pojo.entity.BsPeakFlatValleyEntity;
+import org.springblade.desk.energy.pojo.vo.BsPeakFlatValleyVO;
+import java.util.Objects;
+
+/**
+ * 峰平谷 包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2026-03-03
+ */
+public class BsPeakFlatValleyWrapper extends BaseEntityWrapper<BsPeakFlatValleyEntity, BsPeakFlatValleyVO>  {
+
+	public static BsPeakFlatValleyWrapper build() {
+		return new BsPeakFlatValleyWrapper();
+ 	}
+
+	@Override
+	public BsPeakFlatValleyVO entityVO(BsPeakFlatValleyEntity bsPeakFlatValley) {
+		BsPeakFlatValleyVO bsPeakFlatValleyVO = Objects.requireNonNull(BeanUtil.copyProperties(bsPeakFlatValley, BsPeakFlatValleyVO.class));
+
+		//User createUser = UserCache.getUser(bsPeakFlatValley.getCreateUser());
+		//User updateUser = UserCache.getUser(bsPeakFlatValley.getUpdateUser());
+		//bsPeakFlatValleyVO.setCreateUserName(createUser.getName());
+		//bsPeakFlatValleyVO.setUpdateUserName(updateUser.getName());
+
+		return bsPeakFlatValleyVO;
+	}
+
+
+}