From 19fc69a084be9c2f57b4a391b0138c3692a904c9 Mon Sep 17 00:00:00 2001 From: pzj Date: Sun, 29 Sep 2024 20:15:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=AB=99=E7=82=B9=E5=92=8C?= =?UTF-8?q?=E8=BE=8A=E9=81=93=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/MesBallTrackRuleServiceImpl.java | 16 ++++++++++++---- .../serviceimpl/base/MesStationServiceImpl.java | 20 ++++++++++++++++---- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBallTrackRuleServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBallTrackRuleServiceImpl.java index dbdca2a..c382d0d 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBallTrackRuleServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBallTrackRuleServiceImpl.java @@ -5,8 +5,10 @@ import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.MesBallTrackRule; +import cn.estsh.i3plus.pojo.mes.repository.MesEquipmentRepository; import cn.estsh.impp.framework.boot.util.ValidatorBean; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -20,9 +22,13 @@ import org.springframework.stereotype.Service; @Slf4j public class MesBallTrackRuleServiceImpl extends BaseMesService implements IMesBallTrackRuleService { + + @Autowired + private MesEquipmentRepository mesEquipmentRepository; @Override protected void setPackQueryBean(MesBallTrackRule bean, DdlPackBean packBean) { DdlPreparedPack.getStringEqualPack(bean.getEquipmentCode(), "equipmentCode", packBean); + DdlPreparedPack.getNumEqualPack(bean.getBallTrackType(), "ballTrackType", packBean); DdlPreparedPack.getStringLikerPack(bean.getBallTrackName(), "ballTrackName", packBean); } @@ -30,11 +36,12 @@ public class MesBallTrackRuleServiceImpl extends BaseMesService implements IMesStationService { + @Autowired + private MesEquipmentRepository mesEquipmentRepository; + @Override + protected void setPackQueryBean(MesStation bean, DdlPackBean packBean) { + DdlPreparedPack.getStringLikerPack(bean.getStation(), "station", packBean); + DdlPreparedPack.getNumEqualPack(bean.getStationType(), "stationType", packBean); + DdlPreparedPack.getStringLikerPack(bean.getEquipmentCode(), "equipmentCode", packBean); + } @Override protected void onInsertBean(MesStation item) { ValidatorBean.checkNotNull(item.getEquipmentCode(),"设备代码不能为空"); DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(item.getEquipmentCode(),"equipmentCode",ddlPackBean); - if (baseRDao.isExitByHql(ddlPackBean)){ - MesException.throwBusiException("设备代码已存在"); + if (!mesEquipmentRepository.isExitByHql(ddlPackBean)){ + MesException.throwBusiException("设备代码不存在"); } } @Override protected void onUpdateBean(MesStation item) { ValidatorBean.checkNotNull(item.getId(),"主键不能为空"); + ValidatorBean.checkNotNull(item.getStation(),"站点不能为空"); + ValidatorBean.checkNotNull(item.getStationType(),"站点类型不能为空"); ValidatorBean.checkNotNull(item.getEquipmentCode(),"设备代码不能为空"); DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(item.getEquipmentCode(),"equipmentCode",ddlPackBean); DdlPreparedPack.getNumNOEqualPack(item.getId(),"id",ddlPackBean); - if (baseRDao.isExitByHql(ddlPackBean)){ - MesException.throwBusiException("设备代码已存在"); + if (!mesEquipmentRepository.isExitByHql(ddlPackBean)){ + MesException.throwBusiException("设备代码不存在"); } } }