From bbe3d222152855a548108e519a0038f2efa117a3 Mon Sep 17 00:00:00 2001 From: jun Date: Thu, 13 Jun 2024 14:41:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E5=BF=83=E5=8C=85=E4=B8=AD=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=EF=BC=8C=E4=BA=8C=E5=BC=80=E4=B8=AD=E7=A7=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/api/base/IMesNumberRuleService.java | 13 ----- .../controller/base/MesNumberRuleController.java | 18 ------- .../serviceimpl/base/MesNumberRuleServiceImpl.java | 61 ---------------------- 3 files changed, 92 deletions(-) delete mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesNumberRuleService.java delete mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesNumberRuleController.java delete mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesNumberRuleServiceImpl.java diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesNumberRuleService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesNumberRuleService.java deleted file mode 100644 index 5960e27..0000000 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesNumberRuleService.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.ext.mes.api.base; - -import cn.estsh.i3plus.pojo.mes.bean.MesNumberRule; - -/** - * @Description : 条码生成规则 - * @Reference : - * @Author : junsheng.li - * @CreateDate 2024/6/13 11:17 - * @Modify: - **/ -public interface IMesNumberRuleService extends IBaseMesService { -} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesNumberRuleController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesNumberRuleController.java deleted file mode 100644 index f101b7b..0000000 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesNumberRuleController.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.estsh.i3plus.ext.mes.apiservice.controller.base; - -import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; -import cn.estsh.i3plus.pojo.mes.bean.MesNumberRule; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @Description : 条码生成规则 - * @Reference : - * @Author : junsheng.li - * @CreateDate 2024/6/13 11:17 - * @Modify: - **/ -@RestController -@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesNumberRule") -public class MesNumberRuleController extends BaseMesController { -} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesNumberRuleServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesNumberRuleServiceImpl.java deleted file mode 100644 index 07d98e9..0000000 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesNumberRuleServiceImpl.java +++ /dev/null @@ -1,61 +0,0 @@ -package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; - -import cn.estsh.i3plus.ext.mes.api.base.IMesNumberRuleService; -import cn.estsh.i3plus.ext.mes.apiservice.unit.exception.MesException; -import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; -import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.mes.bean.MesNumberRule; -import cn.estsh.impp.framework.boot.util.ValidatorBean; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * @Description : 规则代码 - * @Reference : - * @Author : junsheng.li - * @CreateDate 2024/6/13 11:19 - * @Modify: - **/ -@Service -@Slf4j -public class MesNumberRuleServiceImpl extends BaseMesService implements IMesNumberRuleService { - - @Override - protected void setPackQueryBean(MesNumberRule bean, DdlPackBean packBean) { - DdlPreparedPack.getStringLikerPack(bean.getRuleCode(), "ruleCode", packBean); - DdlPreparedPack.getStringLikerPack(bean.getPrefix(), "prefix", packBean); - DdlPreparedPack.getStringLikerPack(bean.getNumberRule(), "numberRule", packBean); - DdlPreparedPack.getNumEqualPack(bean.getIsCycle(), "isCycle", packBean); - } - - @Override - protected void onInsertBean(MesNumberRule item) { - // 数据校验 - checkNotNull(item); - - DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); - DdlPreparedPack.getStringLikerPack(item.getRuleCode(), "ruleCode", packBean); - - if (baseRDao.isExitByHql(packBean)) { - MesException.throwMesBusiException("规则代码【%s】数据已存在", item.getRuleCode()); - } - } - - @Override - protected void onUpdateBean(MesNumberRule item) { - // 数据校验 - checkNotNull(item); - - DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); - DdlPreparedPack.getStringLikerPack(item.getRuleCode(), "ruleCode", ddlPackBean); - DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", ddlPackBean); - - if (baseRDao.isExitByHql(ddlPackBean)) { - MesException.throwMesBusiException("规则代码【%s】数据已存在", item.getRuleCode()); - } - } - - private void checkNotNull(MesNumberRule item) { - ValidatorBean.checkNotNull(item.getRuleCode(), "规则代码不能为空"); - } -}