From 75e5a8de288722913dea5ac7234c29b97e83f1c4 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 22 四月 2025 17:44:04 +0800
Subject: [PATCH] chore: 更新 .gitignore 文件
---
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/ComSupportP206V202404.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/ComSupportP206V202404.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/ComSupportP206V202404.java
index 285cd06..a4321b4 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/ComSupportP206V202404.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/ComSupportP206V202404.java
@@ -5,6 +5,7 @@
import com.dy.common.mw.protocol.p206V202404.ProtocolConstantV206V202404;
import com.dy.common.mw.protocol.p206V202404.downVos.ComCdXyVo;
import com.dy.common.webUtil.BaseResponse;
+import com.dy.common.webUtil.BaseResponseUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
@@ -22,15 +23,15 @@
//protected static final String mwIp = "romq9311819.vicp.fun" ; //http://romq9311819.vicp.fun:16583
//protected static final String mwPort = "16583" ;
protected static final String mwIp = "127.0.0.1" ;
- protected static final String mwPort = "8071" ;
+ protected static final String mwPort = "65533" ;
protected static String mwUrlTest = "http://" + mwIp + ":" + mwPort + "/rtuMw/com/test" ;
protected static String mwUrlSendCom = "http://" + mwIp + ":" + mwPort + "/rtuMw/com/send" ;
- protected static String rtuAddr = "41162810400100001" ;
+ protected static String rtuAddr = "37142501020100229" ;
protected static String rtuResultSendWebUrl = "http://127.0.0.1:65535/test/comRes/receive" ;
- protected static String controllerType = "57" ;//鎺у埗鍣ㄧ被鍨�
+ protected static String controllerType = "02" ;//鎺у埗鍣ㄧ被鍨� 57姘存车锛�02闃�闂�
protected static Integer projectNo = 10 ;//椤圭洰缂栫爜
protected static String icCardAddr = "04BEA5BB" ;//IC鍗″湴鍧�
@@ -78,8 +79,13 @@
response = restTemplate.exchange(url, HttpMethod.GET, httpEntity, BaseResponse.class);
} catch (Exception e) {
e.printStackTrace();
+ return BaseResponseUtils.buildError("鍚庣绯荤粺鍑洪敊锛屼腑闂翠欢璋冪敤寮傚父");
}
- return response.getBody();
+ if(response == null){
+ return BaseResponseUtils.buildError("鍚庣绯荤粺鍑洪敊锛屼腑闂翠欢璋冪敤寮傚父");
+ }else{
+ return response.getBody();
+ }
}
/**
@@ -98,8 +104,13 @@
response = restTemplate.exchange(url, HttpMethod.POST, httpEntity, BaseResponse.class);
} catch (Exception e) {
e.printStackTrace();
+ return BaseResponseUtils.buildError("鍚庣绯荤粺鍑洪敊锛屼腑闂翠欢璋冪敤寮傚父");
}
- return response.getBody();
+ if(response == null){
+ return BaseResponseUtils.buildError("鍚庣绯荤粺鍑洪敊锛屼腑闂翠欢璋冪敤寮傚父");
+ }else{
+ return response.getBody();
+ }
}
}
--
Gitblit v1.8.0