From a490ce7d3a2152d0ae7c1cf323e8999ef75f4d35 Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Tue, 3 Mar 2026 09:21:47 +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/EnergyQuotaController.java | 2 +- .../controller/EnergyTargetController.java | 2 +- .../desk/energy/mapper/EnergyQuotaMapper.java | 2 +- .../energy/mapper/EnergyTargetMapper.java | 2 +- .../service/impl/EnergyQuotaServiceImpl.java | 4 +- .../service/impl/EnergyTargetServiceImpl.java | 4 +- .../mapper/ProjectApplicationMapper.xml | 1 + .../impl/FmProjectMilestoneServiceImpl.java | 11 ++++- .../service/IStMeasuringMaintenService.java | 45 ------------------- 9 files changed, 18 insertions(+), 55 deletions(-) delete mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStMeasuringMaintenService.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/EnergyQuotaController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/EnergyQuotaController.java index 978fcb72..5bbdd640 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/EnergyQuotaController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/EnergyQuotaController.java @@ -64,7 +64,7 @@ import jakarta.servlet.http.HttpServletResponse; @AllArgsConstructor @RequestMapping("/bsEnergyQuota") @Tag(name = "能源定额", description = "能源定额接口") -public class BsEnergyQuotaController extends BladeController { +public class EnergyQuotaController extends BladeController { private final IBsEnergyQuotaService bsEnergyQuotaService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/EnergyTargetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/EnergyTargetController.java index 99d8fe4a..79c09942 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/EnergyTargetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/EnergyTargetController.java @@ -64,7 +64,7 @@ import jakarta.servlet.http.HttpServletResponse; @AllArgsConstructor @RequestMapping("/bsEnergyTarget") @Tag(name = "能耗目标表", description = "能耗目标表接口") -public class BsEnergyTargetController extends BladeController { +public class EnergyTargetController extends BladeController { private final IBsEnergyTargetService bsEnergyTargetService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyQuotaMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyQuotaMapper.java index 7811efde..8c90d0e4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyQuotaMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyQuotaMapper.java @@ -40,7 +40,7 @@ import java.util.List; * @author BladeX * @since 2026-03-02 */ -public interface BsEnergyQuotaMapper extends BaseMapper { +public interface EnergyQuotaMapper extends BaseMapper { /** * 自定义分页 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyTargetMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyTargetMapper.java index 16979f0f..6ff046e2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyTargetMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyTargetMapper.java @@ -40,7 +40,7 @@ import java.util.List; * @author BladeX * @since 2026-03-02 */ -public interface BsEnergyTargetMapper extends BaseMapper { +public interface EnergyTargetMapper extends BaseMapper { /** * 自定义分页 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/EnergyQuotaServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/EnergyQuotaServiceImpl.java index 91d63c1c..a83425fe 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/EnergyQuotaServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/EnergyQuotaServiceImpl.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.BsEnergyQuotaMapper; +import org.springblade.desk.energy.mapper.EnergyQuotaMapper; 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 BsEnergyQuotaServiceImpl extends BaseServiceImpl implements IBsEnergyQuotaService { +public class EnergyQuotaServiceImpl 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/EnergyTargetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/EnergyTargetServiceImpl.java index e4d21b6f..62ab8477 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/EnergyTargetServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/EnergyTargetServiceImpl.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.BsEnergyTargetMapper; +import org.springblade.desk.energy.mapper.EnergyTargetMapper; 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 BsEnergyTargetServiceImpl extends BaseServiceImpl implements IBsEnergyTargetService { +public class EnergyTargetServiceImpl extends BaseServiceImpl implements IBsEnergyTargetService { @Override public IPage selectBsEnergyTargetPage(IPage page, BsEnergyTargetVO bsEnergyTarget) { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/ProjectApplicationMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/ProjectApplicationMapper.xml index 688f38bb..43498173 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/ProjectApplicationMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/ProjectApplicationMapper.xml @@ -46,6 +46,7 @@ and n.PROJECT_HEAD = #{fmProjectApplication.projectHead} + order by n.create_time desc diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectMilestoneServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectMilestoneServiceImpl.java index d60584fb..3f87cf95 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectMilestoneServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectMilestoneServiceImpl.java @@ -34,6 +34,7 @@ import org.apache.commons.lang3.StringUtils; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.mp.support.Condition; +import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.desk.process.excel.FmProjectMilestoneExcel; @@ -45,6 +46,8 @@ import org.springblade.desk.process.service.IFmProjectApplicationService; import org.springblade.desk.process.service.IFmProjectMilestoneService; import org.springblade.resource.feign.IAttachClient; import org.springblade.resource.pojo.entity.Attach; +import org.springblade.system.feign.IUserClient; +import org.springblade.system.pojo.entity.User; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -64,6 +67,7 @@ public class FmProjectMilestoneServiceImpl extends BaseServiceImpl selectFmProjectMilestonePage(IPage page, FmProjectMilestoneVO fmProjectMilestone) { return page.setRecords(baseMapper.selectFmProjectMilestonePage(page, fmProjectMilestone)); @@ -107,7 +111,9 @@ public class FmProjectMilestoneServiceImpl extends BaseServiceImpl { - /** - * 自定义分页 - * - * @param page 分页参数 - * @param stMeasuringMainten 查询参数 - * @return IPage - */ - IPage selectStMeasuringMaintenPage(IPage page, StMeasuringMaintenVO stMeasuringMainten); - - - /** - * 导出数据 - * - * @param queryWrapper 查询条件 - * @return List - */ - List exportStMeasuringMainten(Wrapper queryWrapper); - - boolean saveData(List rlsIds, BladeUser user); - - boolean maintenanceAppFun(List mmIdLst, BladeUser user); -} -