From 3edcf811c7a4b5dc8de9117d88d199b0d74e81a6 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 16 八月 2024 16:42:09 +0800
Subject: [PATCH] 2024-08-16 朱宝民 优化代码
---
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/ComSupportP206V1_0_0.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/ComSupportP206V1_0_0.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/ComSupportP206V1_0_0.java
index 78aa00a..ae511a8 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/ComSupportP206V1_0_0.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/ComSupportP206V1_0_0.java
@@ -20,17 +20,36 @@
public class ComSupportP206V1_0_0 {
protected static String mwUrlTest = "http://127.0.0.1:8070/rtuMw/com/test" ;
protected static String mwUrlSendCom = "http://127.0.0.1:8070/rtuMw/com/send" ;
-
protected static String rtuAddr = "532328059995" ;
+
+// protected static String mwUrlTest = "http://8.140.179.55:8071/rtuMw/com/test" ;
+// protected static String mwUrlSendCom = "http://8.140.179.55:8071/rtuMw/com/send" ;
+// protected static String rtuAddr = "620202000066" ;
+
protected static String rtuResultSendWebUrl = "http://127.0.0.1:65535/test/comRes/receive" ;
- protected static String icCardNo = "7044010686" ;//IC鍗＄紪鍙凤紙鐢ㄦ埛鍗″簭鍒楀彿锛�
+ protected static String vsIcCardNo = "61181622830147822" ;//铏氭嫙IC鍗＄紪鍙凤紙鐢ㄦ埛铏氭嫙鍗″簭鍒楀彿锛�
@Autowired
private RestTemplate restTemplate;
- protected Command command(String code, Object param, String comId){
+ protected Command commandLocal(String code, Object param, String comId){
+ Command com = new Command() ;
+ com.id = comId==null?Command.defaultId:(comId.trim().equals("")?Command.defaultId:comId) ;//瀹為檯搴旂敤涓紝鏇挎崲鎴愭暟鎹簱璁板綍id
+ com.protocol = ProtocolConstantV206V1_0_0.protocolName ;
+ com.code = code ;
+ com.rtuAddr = rtuAddr ;
+ com.type = CommandType.innerCommand ;
+ com.rtuResultSendWebUrl = rtuResultSendWebUrl ;
+
+ com.param = param ;
+
+ return com ;
+ }
+
+
+ protected Command commandOuter(String code, Object param, String comId){
Command com = new Command() ;
com.id = comId==null?Command.defaultId:(comId.trim().equals("")?Command.defaultId:comId) ;//瀹為檯搴旂敤涓紝鏇挎崲鎴愭暟鎹簱璁板綍id
com.protocol = ProtocolConstantV206V1_0_0.protocolName ;
@@ -44,6 +63,7 @@
return com ;
}
+
/**
* 杩炴帴閫氫俊涓棿浠舵祴璇�
* @return
--
Gitblit v1.8.0