From ac90d30220a88be8df7c7b6c575acb25d7bda716 Mon Sep 17 00:00:00 2001 From: jun Date: Tue, 19 Nov 2024 14:30:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=82=B9=E6=A3=80=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E6=96=B9=E6=A1=88=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/pcn/api/base/IMesEquipmentExtService.java | 3 +++ .../controller/busi/MesBusiController.java | 26 ++++++++++++++++++++++ .../serviceimpl/base/MesEquipmentExtService.java | 8 +++++++ 3 files changed, 37 insertions(+) diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesEquipmentExtService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesEquipmentExtService.java index d86d540..4db28e9 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesEquipmentExtService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesEquipmentExtService.java @@ -40,5 +40,8 @@ public interface IMesEquipmentExtService { @ApiOperation(value = "根据设备代码和通道查询设备通道信息") MesEquipmentChannel getMesEquipmentChannel(String organizeCode, String equipmentCode,String channel); + @ApiOperation(value = "根据ID查询设备信息") + MesEquipment getMesEquipmentByEquipId(String organizeCode, Integer equipId); + } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesBusiController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesBusiController.java index b764fd0..bf6f2ae 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesBusiController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesBusiController.java @@ -1,11 +1,14 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.controller.busi; +import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesEquipmentExtService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesConfigService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProduceSnExtService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionRecordService; +import cn.estsh.i3plus.ext.mes.pcn.apiservice.util.MesPcnException; import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.mes.bean.MesConfig; +import cn.estsh.i3plus.pojo.mes.bean.MesEquipment; import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; import cn.estsh.i3plus.pojo.mes.bean.MesProductionRecord; import cn.estsh.impp.framework.boot.exception.ImppBusiException; @@ -20,6 +23,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.Objects; + /** * @Description : 业务信息 * @Reference : @@ -42,6 +47,9 @@ public class MesBusiController { @Autowired private IMesConfigService mesConfigService; + @Autowired + private IMesEquipmentExtService mesEquipmentExtService; + @GetMapping("/mesProduceSn/query") @ApiOperation(value = "查询条码信息") public ResultBean queryMesProduceSn(MesProduceSn mesProduceSn, Pager pager) { @@ -81,4 +89,22 @@ public class MesBusiController { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } + + @GetMapping("/mesEquipment/getByEquipId") + @ApiOperation(value = "根据设备ID") + public ResultBean queryMesEquipment(String organizeCode, Integer equipId) { + try { + ValidatorBean.checkNotNull(organizeCode, "工厂代码不能为空"); + ValidatorBean.checkNotNull(equipId, "设备ID不能为空"); + MesEquipment mesEquipmentByEquipId = mesEquipmentExtService.getMesEquipmentByEquipId(organizeCode, equipId); + if(Objects.isNull(mesEquipmentByEquipId)){ + MesPcnException.throwMesBusiException("设备ID【%s】设备信息不存在",equipId); + } + return ResultBean.success("查询成功").setResultObject(mesEquipmentByEquipId); + } catch (ImppBusiException imppException) { + return ResultBean.fail(imppException); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesEquipmentExtService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesEquipmentExtService.java index 94ead98..de3d3c9 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesEquipmentExtService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesEquipmentExtService.java @@ -147,4 +147,12 @@ public class MesEquipmentExtService implements IMesEquipmentExtService { new String[]{MesPcnExtConstWords.ORGANIZE_CODE, MesPcnExtConstWords.IS_DELETED, MesPcnExtConstWords.IS_VALID, MesPcnExtConstWords.EQUIPMENT_CODE, MesPcnExtConstWords.CHANNEL}, new Object[]{organizeCode, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue(), equipmentCode, channel}); } + + @Override + public MesEquipment getMesEquipmentByEquipId(String organizeCode, Integer equipId) { + if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(equipId)) return null; + return equipmentRepository.getByProperty( + new String[]{MesPcnExtConstWords.ORGANIZE_CODE, MesPcnExtConstWords.IS_DELETED, MesPcnExtConstWords.IS_VALID, MesPcnExtConstWords.EQUIP_ID}, + new Object[]{organizeCode, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue(), equipId}); + } }