From 9599dc038b5f79d62868c6088f92a987995f6cde Mon Sep 17 00:00:00 2001 From: gsz Date: Fri, 17 May 2024 11:02:43 +0800 Subject: [PATCH] =?UTF-8?q?MesMaximo=E6=9F=A5=E8=AF=A2=E4=BB=AA=E8=A1=A8?= =?UTF-8?q?=E4=B8=BB=E6=95=B0=E6=8D=AE+=E8=AE=BE=E5=A4=87=E4=B8=BB?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/base/IMesMaximoAssetMainDataService.java | 13 ++++++++++ .../api/base/IMesMaximoMeterMainDataService.java | 13 ++++++++++ .../base/MesMaximoAssetMainDataController.java | 18 ++++++++++++++ .../base/MesMaximoMeterMainDataController.java | 18 ++++++++++++++ .../base/MesMaximoAssetMainDataServiceImpl.java | 29 ++++++++++++++++++++++ .../base/MesMaximoMeterMainDataServiceImpl.java | 28 +++++++++++++++++++++ .../serviceimpl/busi/MaximoServiceImpl.java | 24 ++++++------------ 7 files changed, 127 insertions(+), 16 deletions(-) create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesMaximoAssetMainDataService.java create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesMaximoMeterMainDataService.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMaximoAssetMainDataController.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMaximoMeterMainDataController.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoAssetMainDataServiceImpl.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoMeterMainDataServiceImpl.java diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesMaximoAssetMainDataService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesMaximoAssetMainDataService.java new file mode 100644 index 0000000..54e66a8 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesMaximoAssetMainDataService.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesMaximoAssetMainData; + +/** + * @Description :Maximo设备主数据 + * @Reference : + * @Author : gsz + * @CreateDate 2024/5/17 10:06 + * @Modify: + **/ +public interface IMesMaximoAssetMainDataService extends IBaseMesService { +} diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesMaximoMeterMainDataService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesMaximoMeterMainDataService.java new file mode 100644 index 0000000..8df6f9c --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesMaximoMeterMainDataService.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesMaximoMeterMainData; + +/** + * @Description :Maximo仪表主数据 + * @Reference : + * @Author : gsz + * @CreateDate 2024/5/17 10:06 + * @Modify: + **/ +public interface IMesMaximoMeterMainDataService extends IBaseMesService { +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMaximoAssetMainDataController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMaximoAssetMainDataController.java new file mode 100644 index 0000000..2bebdf3 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMaximoAssetMainDataController.java @@ -0,0 +1,18 @@ +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.MesMaximoAssetMainData; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description : + * @Reference : + * @Author : gsz + * @CreateDate : 2024-05-17 10:16 + * @Modify: + **/ +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesMaximoAssetMainData") +public class MesMaximoAssetMainDataController extends BaseMesController{ +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMaximoMeterMainDataController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMaximoMeterMainDataController.java new file mode 100644 index 0000000..c5bc642 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMaximoMeterMainDataController.java @@ -0,0 +1,18 @@ +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.MesMaximoMeterMainData; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description : + * @Reference : + * @Author : gsz + * @CreateDate : 2024-05-17 10:16 + * @Modify: + **/ +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesMaximoMeterMainData") +public class MesMaximoMeterMainDataController extends BaseMesController{ +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoAssetMainDataServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoAssetMainDataServiceImpl.java new file mode 100644 index 0000000..8a9e62a --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoAssetMainDataServiceImpl.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.api.base.IMesMaximoAssetMainDataService; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.MesMaximoAssetMainData; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + + +/** + * @Description : Maximo设备主数据 + * @Reference : + * @Author : gsz + * @CreateDate 2024/5/17 10:06 + * @Modify: + **/ +@Service +@Slf4j +public class MesMaximoAssetMainDataServiceImpl extends BaseMesService implements IMesMaximoAssetMainDataService { + + protected void setPackQueryBean(MesMaximoAssetMainData bean, DdlPackBean packBean) { + DdlPreparedPack.getStringEqualPack(bean.getAssetNum(), "assetNum", packBean); + DdlPreparedPack.getNumEqualPack(bean.getDescription(), "description", packBean); + DdlPreparedPack.getStringEqualPack(bean.getStatus(), "status", packBean); + DdlPreparedPack.getStringEqualPack(bean.getFailureCode(), "failureCode", packBean); + } + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoMeterMainDataServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoMeterMainDataServiceImpl.java new file mode 100644 index 0000000..851bf58 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMaximoMeterMainDataServiceImpl.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.api.base.IMesMaximoMeterMainDataService; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.MesMaximoMeterMainData; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + + +/** + * @Description : Maximo仪表主数据 + * @Reference : + * @Author : gsz + * @CreateDate 2024/5/17 10:06 + * @Modify: + **/ +@Service +@Slf4j +public class MesMaximoMeterMainDataServiceImpl extends BaseMesService implements IMesMaximoMeterMainDataService { + + protected void setPackQueryBean(MesMaximoMeterMainData bean, DdlPackBean packBean) { + DdlPreparedPack.getStringEqualPack(bean.getAssetNum(), "assetNum", packBean); + DdlPreparedPack.getNumEqualPack(bean.getBaseMeasureUnitId(), "baseMeasureUnitId", packBean); + DdlPreparedPack.getStringEqualPack(bean.getMeterName(), "meterName", packBean); + } + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MaximoServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MaximoServiceImpl.java index 2cd1a34..0a2ea34 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MaximoServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MaximoServiceImpl.java @@ -2,21 +2,13 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.busi; import cn.estsh.i3plus.ext.mes.api.busi.IMaximoService; import cn.estsh.i3plus.ext.mes.pojo.model.MaximoParamModel; -import cn.estsh.i3plus.icloud.softswitch.sdk.IBsSuitServiceCloud; import cn.estsh.i3plus.platform.common.convert.ConvertBean; -import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; -import cn.estsh.i3plus.platform.common.tool.HttpClientTool; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.mes.bean.MaximoAssetMainData; -import cn.estsh.i3plus.pojo.mes.bean.MaximoMeterMainData; -import cn.estsh.i3plus.pojo.mes.repository.IMaximoAssetMainDataRepository; -import cn.estsh.i3plus.pojo.mes.repository.IMaximoMeterMainDataRepository; -import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.util.ResultBean; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import cn.estsh.i3plus.pojo.mes.bean.MesMaximoAssetMainData; +import cn.estsh.i3plus.pojo.mes.bean.MesMaximoMeterMainData; +import cn.estsh.i3plus.pojo.mes.repository.IMesMaximoAssetMainDataRepository; +import cn.estsh.i3plus.pojo.mes.repository.IMesMaximoMeterMainDataRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -37,10 +29,10 @@ public class MaximoServiceImpl implements IMaximoService { private static final Logger LOGGER = LoggerFactory.getLogger(MaximoServiceImpl.class); @Autowired - private IMaximoAssetMainDataRepository maximoAssetMainDataRDao; + private IMesMaximoAssetMainDataRepository maximoAssetMainDataRDao; @Autowired - private IMaximoMeterMainDataRepository maximoMeterMainDataRDao; + private IMesMaximoMeterMainDataRepository maximoMeterMainDataRDao; @Override @@ -59,7 +51,7 @@ public class MaximoServiceImpl implements IMaximoService { return resultMap; } try { - MaximoMeterMainData maximoMeterMainData = new MaximoMeterMainData(); + MesMaximoMeterMainData maximoMeterMainData = new MesMaximoMeterMainData(); maximoMeterMainData.setOrganizeCode(paramModel.getSiteId()); maximoMeterMainData.setMeterName(paramModel.getMeterName()); maximoMeterMainData.setAssetNum(paramModel.getAssetNum()); @@ -107,7 +99,7 @@ public class MaximoServiceImpl implements IMaximoService { return resultMap; } try { - MaximoAssetMainData maximoAssetMainData = new MaximoAssetMainData(); + MesMaximoAssetMainData maximoAssetMainData = new MesMaximoAssetMainData(); maximoAssetMainData.setOrganizeCode(paramModel.getSiteId()); maximoAssetMainData.setAssetNum(paramModel.getAssetNum()); maximoAssetMainData.setDescription(paramModel.getDescription());