From 2aa819c5a081b16245559b61b3f6f5e9708c2ee7 Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Tue, 27 Jan 2026 10:08:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/LauncherConstant.java | 4 +- .../service/impl/MoldPlanServiceImpl.java | 100 ------------------ 2 files changed, 2 insertions(+), 102 deletions(-) delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanServiceImpl.java diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index b67c2f7e..9fa4230c 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -12,9 +12,9 @@ public interface LauncherConstant { /** * nacos 命名空间 */ - String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e"; +// String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e"; // 生产环境 -// String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401"; + String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401"; // 测试环境 // String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8"; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanServiceImpl.java deleted file mode 100644 index 9a947e96..00000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanServiceImpl.java +++ /dev/null @@ -1,100 +0,0 @@ -package org.springblade.desk.order.service.impl; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import lombok.RequiredArgsConstructor; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springblade.desk.dashboard.pojo.entity.DsPartEntity; -import org.springblade.desk.dashboard.service.IDsPartService; -import org.springblade.desk.order.pojo.entity.MoldPlan; -import org.springblade.desk.order.pojo.entity.MoldPlanOrder; -import org.springblade.desk.order.pojo.entity.MoldPlanTool; -import org.springblade.desk.order.mapper.MoldPlanMapper; -import org.springblade.desk.order.pojo.enums.MoldPlanEnum; -import org.springblade.desk.order.service.IMoldPlanOrderService; -import org.springblade.desk.order.service.IMoldPlanService; -import org.springblade.desk.order.service.IMoldPlanToolService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - * 服务实现类 - * - * @author BladeX - */ -@RequiredArgsConstructor -@Service -public class MoldPlanServiceImpl extends BaseServiceImpl implements IMoldPlanService { - - private final IMoldPlanOrderService orderService; - - private final IMoldPlanToolService toolService; - - private final IDsPartService dsPartService; - - @Override - public IPage selectPage(IPage page, MoldPlan entity) { - List dataList = baseMapper.selectPage(page, entity); - return page.setRecords(dataList); - } - - @Override - public IPage selectPageApply(IPage page, MoldPlan entity) { - entity.setSource(MoldPlanEnum.SOURCE_USER.getCode()); - List dataList = baseMapper.selectPage(page, entity); - return page.setRecords(dataList); - } - - @Override - public IPage pageNearlyMonth(IPage page, MoldPlan entity) { - return null; - } - - @Override - public boolean save(List planList) { - for (MoldPlan moldPlan : planList) { - moldPlan.setStatus(MoldPlanEnum.MAF_STATUS_CREATE.getCode()); - moldPlan.setSource(MoldPlanEnum.SOURCE_USER.getCode()); - // 工装 - DsPartEntity dsPart = dsPartService.selectDsPartByPatCodeAndVersion(moldPlan.getPartCode(),null); - if (dsPart != null && "压饼模".equals(dsPart.getPartName())) { - moldPlan.setPlanTypeCode(MoldPlanEnum.PLAN_TYPE_CODE_Z.getName()); - moldPlan.setPlanTypeName(MoldPlanEnum.PLAN_TYPE_CODE_D.getName()); - } else if (dsPart != null && "石墨模".equals(dsPart.getPartName())) { - moldPlan.setPlanTypeCode(MoldPlanEnum.PLAN_TYPE_CODE_Z.getName()); - moldPlan.setPlanTypeName(MoldPlanEnum.PLAN_TYPE_NAME_D.getName()); - } - } - return this.saveBatch(planList); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public boolean save(MoldPlan entity, List orderList, List toolList) { - if (this.save(entity)) { - for (MoldPlanOrder moldPlanOrder : orderList) { - moldPlanOrder.setMpId(entity.getId()); - } - orderService.saveBatch(orderList); - - for (MoldPlanTool moldPlanTool : toolList) { - moldPlanTool.setMpId(entity.getId()); - } - toolService.saveBatch(toolList); - return true; - } - return false; - } - - @Transactional(rollbackFor = Exception.class) - @Override - public boolean update(MoldPlan entity, List orderList, List toolList) { - if (this.save(entity)) { - orderService.saveBatch(orderList); - toolService.saveBatch(toolList); - return true; - } - return false; - } -}