From 2a89cd57769dde0e1e3c8388756aaf1d9528d8b0 Mon Sep 17 00:00:00 2001 From: jun Date: Thu, 13 Jun 2024 14:12:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=84=E5=88=99=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=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 --- .../ext/mes/api/base/IMesNumberRuleService.java | 13 +++++ .../controller/base/MesNumberRuleController.java | 18 +++++++ ...veRuleImpl.java => MesMoveRuleServiceImpl.java} | 2 +- .../serviceimpl/base/MesNumberRuleServiceImpl.java | 61 ++++++++++++++++++++++ ...pl.java => MesPrinterConfigureServiceImpl.java} | 2 +- ...Impl.java => MesProductOffLineServiceImpl.java} | 2 +- 6 files changed, 95 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesNumberRuleService.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesNumberRuleController.java rename modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/{MesMoveRuleImpl.java => MesMoveRuleServiceImpl.java} (96%) create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesNumberRuleServiceImpl.java rename modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/{MesPrinterConfigureImpl.java => MesPrinterConfigureServiceImpl.java} (94%) rename modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/{MesProductOffLineImpl.java => MesProductOffLineServiceImpl.java} (75%) 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 new file mode 100644 index 0000000..5960e27 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesNumberRuleService.java @@ -0,0 +1,13 @@ +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 new file mode 100644 index 0000000..f101b7b --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesNumberRuleController.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.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/MesMoveRuleImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMoveRuleServiceImpl.java similarity index 96% rename from modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMoveRuleImpl.java rename to modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMoveRuleServiceImpl.java index 325571e..6ba1c42 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMoveRuleImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMoveRuleServiceImpl.java @@ -21,7 +21,7 @@ import java.util.List; **/ @Service @Slf4j -public class MesMoveRuleImpl extends BaseMesService implements IMesMoveRuleService { +public class MesMoveRuleServiceImpl extends BaseMesService implements IMesMoveRuleService { @Override protected void setPackQueryBean(MesMoveRule bean, DdlPackBean packBean) { 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 new file mode 100644 index 0000000..07d98e9 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesNumberRuleServiceImpl.java @@ -0,0 +1,61 @@ +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(), "规则代码不能为空"); + } +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPrinterConfigureImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPrinterConfigureServiceImpl.java similarity index 94% rename from modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPrinterConfigureImpl.java rename to modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPrinterConfigureServiceImpl.java index 67d7cc7..d17414f 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPrinterConfigureImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPrinterConfigureServiceImpl.java @@ -18,7 +18,7 @@ import org.springframework.stereotype.Service; **/ @Service @Slf4j -public class MesPrinterConfigureImpl extends BaseMesService implements IMesPrinterConfigureService { +public class MesPrinterConfigureServiceImpl extends BaseMesService implements IMesPrinterConfigureService { @Override protected void setPackQueryBean(MesPrinterConfigure bean, DdlPackBean packBean) { diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductOffLineImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductOffLineServiceImpl.java similarity index 75% rename from modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductOffLineImpl.java rename to modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductOffLineServiceImpl.java index 93b72cc..c9fa3af 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductOffLineImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductOffLineServiceImpl.java @@ -12,6 +12,6 @@ import org.springframework.stereotype.Service; * @Modify: **/ @Service -public class MesProductOffLineImpl extends BaseMesService implements IMesProductOffLineService { +public class MesProductOffLineServiceImpl extends BaseMesService implements IMesProductOffLineService { } From bbe3d222152855a548108e519a0038f2efa117a3 Mon Sep 17 00:00:00 2001 From: jun Date: Thu, 13 Jun 2024 14:41:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=B8=E5=BF=83=E5=8C=85=E4=B8=AD?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=EF=BC=8C=E4=BA=8C=E5=BC=80=E4=B8=AD=E7=A7=BB?= =?UTF-8?q?=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(), "规则代码不能为空"); - } -} From 54e1dc05abe3c717204b27ae6861a737be368b70 Mon Sep 17 00:00:00 2001 From: administrator Date: Thu, 13 Jun 2024 16:41:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=87=8D=E6=9E=84maximo=E7=9A=84ws?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/apiservice/config/WebServiceConfig.java | 13 ++- .../apiservice/interceptor/CxfInInterceptor.java | 102 ++++++++++----------- .../i3plus/ext/mes/apiservice/model/AssetInfo.java | 11 ++- .../serviceimpl/webservice/WebServiceServer.java | 21 +---- .../webservice/WebServiceServerIns.java | 30 ++++++ 5 files changed, 101 insertions(+), 76 deletions(-) create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/webservice/WebServiceServerIns.java diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/config/WebServiceConfig.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/config/WebServiceConfig.java index 66cc6e6..2600083 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/config/WebServiceConfig.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/config/WebServiceConfig.java @@ -19,11 +19,10 @@ package cn.estsh.i3plus.ext.mes.apiservice.config; -import cn.estsh.i3plus.ext.mes.apiservice.interceptor.CxfInInterceptor; import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.webservice.WebServiceServer; +import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.webservice.WebServiceServerIns; import org.apache.cxf.Bus; import org.apache.cxf.jaxws.EndpointImpl; -import org.apache.cxf.phase.Phase; import org.apache.cxf.transport.servlet.CXFServlet; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.web.servlet.ServletRegistrationBean; @@ -54,8 +53,14 @@ public class WebServiceConfig { @Bean public Endpoint endpoint() { EndpointImpl endpoint = new EndpointImpl(bus, new WebServiceServer()); - endpoint.publish("/mes-service"); - endpoint.getInInterceptors().add(new CxfInInterceptor(Phase.RECEIVE)); + endpoint.publish("/mes-service-equip"); + return endpoint; + } + + @Bean + public Endpoint endpointIns() { + EndpointImpl endpoint = new EndpointImpl(bus, new WebServiceServerIns()); + endpoint.publish("/mes-service-instrument"); return endpoint; } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/interceptor/CxfInInterceptor.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/interceptor/CxfInInterceptor.java index ea22f39..f878e79 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/interceptor/CxfInInterceptor.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/interceptor/CxfInInterceptor.java @@ -1,51 +1,51 @@ -package cn.estsh.i3plus.ext.mes.apiservice.interceptor; - -import org.apache.cxf.binding.soap.SoapMessage; -import org.apache.cxf.helpers.IOUtils; -import org.apache.cxf.interceptor.Fault; -import org.apache.cxf.io.CachedOutputStream; -import org.apache.cxf.phase.AbstractPhaseInterceptor; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; - -import static java.nio.charset.StandardCharsets.UTF_8; - -/** - * @Description : - * @Reference : - * @Author : Castle - * @CreateDate : 2024/6/12 16:20 - * @Modify: - **/ -public class CxfInInterceptor extends AbstractPhaseInterceptor { - - public CxfInInterceptor(String phase) { - super(phase); - } - - @Override - public void handleMessage(SoapMessage message) throws Fault { - // 获取消息内容 - InputStream is = message.getContent(InputStream.class); - try { - if (is != null) { - CachedOutputStream bos = new CachedOutputStream(); - IOUtils.copy(is, bos); - String startXmlMessage = new String(bos.getBytes(), UTF_8); - String afterMessage = ""; - if (startXmlMessage.contains("SyncMaximoEquip")) { - afterMessage = startXmlMessage.replaceAll("ws:", "").replaceAll("tem:info", "ws:assetInfo"); - } else if (startXmlMessage.contains("SyncMaximoInstrumen")) { - afterMessage = startXmlMessage.replaceAll("ws:", "").replaceAll("tem:info", "ws:meterInfo"); - } - // 重新设置输入流，因为它已经被读取 - message.setContent(InputStream.class, new ByteArrayInputStream(afterMessage.getBytes())); - } - } catch (IOException e) { - throw new RuntimeException(e); - } - } - -} +//package cn.estsh.i3plus.ext.mes.apiservice.interceptor; +// +//import org.apache.cxf.binding.soap.SoapMessage; +//import org.apache.cxf.helpers.IOUtils; +//import org.apache.cxf.interceptor.Fault; +//import org.apache.cxf.io.CachedOutputStream; +//import org.apache.cxf.phase.AbstractPhaseInterceptor; +// +//import java.io.ByteArrayInputStream; +//import java.io.IOException; +//import java.io.InputStream; +// +//import static java.nio.charset.StandardCharsets.UTF_8; +// +///** +// * @Description : +// * @Reference : +// * @Author : Castle +// * @CreateDate : 2024/6/12 16:20 +// * @Modify: +// **/ +//public class CxfInInterceptor extends AbstractPhaseInterceptor { +// +// public CxfInInterceptor(String phase) { +// super(phase); +// } +// +// @Override +// public void handleMessage(SoapMessage message) throws Fault { +// // 获取消息内容 +// InputStream is = message.getContent(InputStream.class); +// try { +// if (is != null) { +// CachedOutputStream bos = new CachedOutputStream(); +// IOUtils.copy(is, bos); +// String startXmlMessage = new String(bos.getBytes(), UTF_8); +// String afterMessage = ""; +// if (startXmlMessage.contains("SyncMaximoEquip")) { +// afterMessage = startXmlMessage.replaceAll("ws:", "").replaceAll("tem:info", "ws:assetInfo"); +// } else if (startXmlMessage.contains("SyncMaximoInstrumen")) { +// afterMessage = startXmlMessage.replaceAll("ws:", "").replaceAll("tem:info", "ws:meterInfo"); +// } +// // 重新设置输入流，因为它已经被读取 +// message.setContent(InputStream.class, new ByteArrayInputStream(afterMessage.getBytes())); +// } +// } catch (IOException e) { +// throw new RuntimeException(e); +// } +// } +// +//} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/model/AssetInfo.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/model/AssetInfo.java index 1037a4b..79a1f73 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/model/AssetInfo.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/model/AssetInfo.java @@ -12,10 +12,11 @@ import lombok.Data; @Data public class AssetInfo { private String ASSETNUM; - private String DESCRIPTION; + private String cur30; + private String description; private String FAILURECODE; - private String LOCATION; - private String LOCDESC; - private String SITEID; - private String STATUS; + private String location; + private String locdesc; + private String siteid; + private String status; } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/webservice/WebServiceServer.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/webservice/WebServiceServer.java index ef1ca14..f4642a3 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/webservice/WebServiceServer.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/webservice/WebServiceServer.java @@ -18,32 +18,21 @@ import javax.jws.WebService; import java.util.Map; @Component -@WebService(targetNamespace = "http://tempuri.org/") +@WebService(targetNamespace = "http://yfaiesb/services/ServiceSyncMaximoEquip") public class WebServiceServer { public static final Logger LOGGER = LoggerFactory.getLogger(WebServiceServer.class); - @WebMethod(action = "SyncMaximoEquip", operationName = "SyncMaximoEquip") - public Map syncEquip(@WebParam(name = "assetInfo", targetNamespace = "http://schemas.datacontract.org/2004/07/WS.MAXIMO.DataInBound") AssetInfo assetInfo) { + public Map syncEquip(@WebParam(name = "info") AssetInfo assetInfo) { LOGGER.info("SyncMaximoEquip主数据:{}", assetInfo); MaximoParamModel maximoParamModel = new MaximoParamModel(); maximoParamModel.setAssetNum(assetInfo.getASSETNUM()); - maximoParamModel.setStatus(assetInfo.getSTATUS()); - maximoParamModel.setSiteId(assetInfo.getSITEID()); + maximoParamModel.setStatus(assetInfo.getStatus()); + maximoParamModel.setSiteId(assetInfo.getSiteid()); maximoParamModel.setFailureCode(assetInfo.getFAILURECODE()); - maximoParamModel.setDescription(assetInfo.getDESCRIPTION()); + maximoParamModel.setDescription(assetInfo.getDescription()); MaximoServiceImpl bean = (MaximoServiceImpl)SpringContextsUtil.getBean("maximoServiceImpl"); return bean.doAssetMainData(maximoParamModel); } - @WebMethod(action = "SyncMaximoInstrument", operationName = "SyncMaximoInstrument") - public Map syncInstrument(@WebParam(name = "meterInfo", targetNamespace = "http://schemas.datacontract.org/2004/07/WS.MAXIMO.DataInBound") MeterInfo meterInfo) { - LOGGER.info("syncInstrument主数据:{}", meterInfo); - MaximoParamModel maximoParamModel = new MaximoParamModel(); - maximoParamModel.setAssetNum(meterInfo.getASSETNUM()); - maximoParamModel.setBaseMeasureUnitId(meterInfo.getBASEMEASUREUNITID()); - maximoParamModel.setMeterName(meterInfo.getMETERNAME()); - MaximoServiceImpl bean = (MaximoServiceImpl)SpringContextsUtil.getBean("maximoServiceImpl"); - return bean.doAssetMainData(maximoParamModel); - } } \ No newline at end of file diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/webservice/WebServiceServerIns.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/webservice/WebServiceServerIns.java new file mode 100644 index 0000000..74dc7e9 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/webservice/WebServiceServerIns.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.webservice; + +import cn.estsh.i3plus.ext.mes.apiservice.model.MeterInfo; +import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.busi.MaximoServiceImpl; +import cn.estsh.i3plus.ext.mes.pojo.model.MaximoParamModel; +import cn.estsh.impp.framework.boot.util.SpringContextsUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebService; +import java.util.Map; + +@WebService(targetNamespace = "http://yfaiesb/services/ServiceSyncMaximoInstrument") +public class WebServiceServerIns { + public static final Logger LOGGER = LoggerFactory.getLogger(WebServiceServerIns.class); + + @WebMethod(action = "SyncMaximoInstrument", operationName = "SyncMaximoInstrument") + public Map syncInstrument(@WebParam(name = "info") MeterInfo meterInfo) { + LOGGER.info("syncInstrument主数据:{}", meterInfo); + MaximoParamModel maximoParamModel = new MaximoParamModel(); + maximoParamModel.setAssetNum(meterInfo.getASSETNUM()); + maximoParamModel.setBaseMeasureUnitId(meterInfo.getBASEMEASUREUNITID()); + maximoParamModel.setMeterName(meterInfo.getMETERNAME()); + MaximoServiceImpl bean = (MaximoServiceImpl) SpringContextsUtil.getBean("maximoServiceImpl"); + return bean.doAssetMainData(maximoParamModel); + } + +}