From 2e0ae8833a4c9106814ff06197c9009aaf131959 Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Tue, 3 Mar 2026 09:24:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9-sjx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BsEnergyQuotaController.java | 35 +++++++++---------- .../controller/BsEnergyTargetController.java | 35 +++++++++---------- .../energy/mapper/BsEnergyQuotaMapper.java | 2 +- .../energy/mapper/BsEnergyTargetMapper.java | 2 +- .../impl/BsEnergyQuotaServiceImpl.java | 4 +-- .../impl/BsEnergyTargetServiceImpl.java | 4 +-- 6 files changed, 40 insertions(+), 42 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsEnergyQuotaController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsEnergyQuotaController.java index 5bbdd640..7901e2a4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsEnergyQuotaController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsEnergyQuotaController.java @@ -25,34 +25,33 @@ */ package org.springblade.desk.energy.controller; -import io.swagger.v3.oas.annotations.tags.Tag; +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 com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import lombok.AllArgsConstructor; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; - -import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; +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.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.desk.energy.excel.BsEnergyQuotaExcel; import org.springblade.desk.energy.pojo.entity.BsEnergyQuotaEntity; import org.springblade.desk.energy.pojo.vo.BsEnergyQuotaVO; -import org.springblade.desk.energy.excel.BsEnergyQuotaExcel; -import org.springblade.desk.energy.wrapper.BsEnergyQuotaWrapper; import org.springblade.desk.energy.service.IBsEnergyQuotaService; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; -import java.util.Map; +import org.springblade.desk.energy.wrapper.BsEnergyQuotaWrapper; +import org.springframework.web.bind.annotation.*; + import java.util.List; -import jakarta.servlet.http.HttpServletResponse; +import java.util.Map; /** * 能源定额 控制器 @@ -64,7 +63,7 @@ import jakarta.servlet.http.HttpServletResponse; @AllArgsConstructor @RequestMapping("/bsEnergyQuota") @Tag(name = "能源定额", description = "能源定额接口") -public class EnergyQuotaController extends BladeController { +public class BsEnergyQuotaController extends BladeController { private final IBsEnergyQuotaService bsEnergyQuotaService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsEnergyTargetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsEnergyTargetController.java index 79c09942..d4b3774d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsEnergyTargetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsEnergyTargetController.java @@ -25,34 +25,33 @@ */ package org.springblade.desk.energy.controller; -import io.swagger.v3.oas.annotations.tags.Tag; +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 com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import lombok.AllArgsConstructor; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; - -import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; +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.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.desk.energy.excel.BsEnergyTargetExcel; import org.springblade.desk.energy.pojo.entity.BsEnergyTargetEntity; import org.springblade.desk.energy.pojo.vo.BsEnergyTargetVO; -import org.springblade.desk.energy.excel.BsEnergyTargetExcel; -import org.springblade.desk.energy.wrapper.BsEnergyTargetWrapper; import org.springblade.desk.energy.service.IBsEnergyTargetService; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; -import java.util.Map; +import org.springblade.desk.energy.wrapper.BsEnergyTargetWrapper; +import org.springframework.web.bind.annotation.*; + import java.util.List; -import jakarta.servlet.http.HttpServletResponse; +import java.util.Map; /** * 能耗目标表 控制器 @@ -64,7 +63,7 @@ import jakarta.servlet.http.HttpServletResponse; @AllArgsConstructor @RequestMapping("/bsEnergyTarget") @Tag(name = "能耗目标表", description = "能耗目标表接口") -public class EnergyTargetController extends BladeController { +public class BsEnergyTargetController extends BladeController { private final IBsEnergyTargetService bsEnergyTargetService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsEnergyQuotaMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsEnergyQuotaMapper.java index 8c90d0e4..7811efde 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsEnergyQuotaMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsEnergyQuotaMapper.java @@ -40,7 +40,7 @@ import java.util.List; * @author BladeX * @since 2026-03-02 */ -public interface EnergyQuotaMapper extends BaseMapper { +public interface BsEnergyQuotaMapper extends BaseMapper { /** * 自定义分页 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsEnergyTargetMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsEnergyTargetMapper.java index 6ff046e2..16979f0f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsEnergyTargetMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsEnergyTargetMapper.java @@ -40,7 +40,7 @@ import java.util.List; * @author BladeX * @since 2026-03-02 */ -public interface EnergyTargetMapper extends BaseMapper { +public interface BsEnergyTargetMapper extends BaseMapper { /** * 自定义分页 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEnergyQuotaServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEnergyQuotaServiceImpl.java index a83425fe..91d63c1c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEnergyQuotaServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEnergyQuotaServiceImpl.java @@ -28,7 +28,7 @@ package org.springblade.desk.energy.service.impl; import org.springblade.desk.energy.pojo.entity.BsEnergyQuotaEntity; import org.springblade.desk.energy.pojo.vo.BsEnergyQuotaVO; import org.springblade.desk.energy.excel.BsEnergyQuotaExcel; -import org.springblade.desk.energy.mapper.EnergyQuotaMapper; +import org.springblade.desk.energy.mapper.BsEnergyQuotaMapper; import org.springblade.desk.energy.service.IBsEnergyQuotaService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -43,7 +43,7 @@ import java.util.List; * @since 2026-03-02 */ @Service -public class EnergyQuotaServiceImpl extends BaseServiceImpl implements IBsEnergyQuotaService { +public class BsEnergyQuotaServiceImpl extends BaseServiceImpl implements IBsEnergyQuotaService { @Override public IPage selectBsEnergyQuotaPage(IPage page, BsEnergyQuotaVO bsEnergyQuota) { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEnergyTargetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEnergyTargetServiceImpl.java index 62ab8477..e4d21b6f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEnergyTargetServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEnergyTargetServiceImpl.java @@ -28,7 +28,7 @@ package org.springblade.desk.energy.service.impl; import org.springblade.desk.energy.pojo.entity.BsEnergyTargetEntity; import org.springblade.desk.energy.pojo.vo.BsEnergyTargetVO; import org.springblade.desk.energy.excel.BsEnergyTargetExcel; -import org.springblade.desk.energy.mapper.EnergyTargetMapper; +import org.springblade.desk.energy.mapper.BsEnergyTargetMapper; import org.springblade.desk.energy.service.IBsEnergyTargetService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -43,7 +43,7 @@ import java.util.List; * @since 2026-03-02 */ @Service -public class EnergyTargetServiceImpl extends BaseServiceImpl implements IBsEnergyTargetService { +public class BsEnergyTargetServiceImpl extends BaseServiceImpl implements IBsEnergyTargetService { @Override public IPage selectBsEnergyTargetPage(IPage page, BsEnergyTargetVO bsEnergyTarget) {