From 784f9cec56eef3c7ac0ba02de98fdbf341c6a7b3 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期一, 25 四月 2022 18:38:29 +0800
Subject: [PATCH] 0428IssueFix
---
force-app/main/default/classes/NFMUtil.cls | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/classes/NFMUtil.cls b/force-app/main/default/classes/NFMUtil.cls
index 56315c8..22e8c7e 100644
--- a/force-app/main/default/classes/NFMUtil.cls
+++ b/force-app/main/default/classes/NFMUtil.cls
@@ -130,6 +130,7 @@
AWS_DOMAIN = 'https://olympus.bqbot.com';
// 鏂版湇鍔＄郴缁� 鏈湴鐜锛堜复鏃讹級
// AWS_DOMAIN = 'http://114.249.236.98:29990';
+ // AWS_DOMAIN = 'http://114.249.231.75:29995';
// AWS_DOMAIN = 'http://jzbase.bqbot.com:29990';
// AWS_DOMAIN = 'http://114.249.238.243:29990';
@@ -179,6 +180,8 @@
NFM702_ENDPOINT = 'https://wdp.olympus.com.cn:44302/RESTAdapter/NFM702';
NFM703_ENDPOINT = 'https://wdp.olympus.com.cn:44302/RESTAdapter/NFM703';
+ //鍏堟鍚庝慨
+ NFM112_ENDPOINT = 'http://wdp.olympus.com.cn:8089/RESTAdapter/NFM112';
//鏍锋湰绠＄悊
NFM115_ENDPOINT = 'https://wdp.olympus.com.cn:44302/RESTAdapter/NFM115';
@@ -364,6 +367,24 @@
}
return rtn;
}
+
+ // lt 20220419 Start
+ /**
+ * @return yyyy/MM/dd 銇棩浠樻枃瀛楀垪
+ */
+ public static String formatDateTime2StrSprit2(DateTime dt) {
+ String rtn = null;
+ if (dt == null) {
+ rtn = '';
+ } else {
+ String pDate = formatDateTime2Str(dt);
+ rtn = (pDate.substring(0, 4)) + '/' +
+ (pDate.substring(4, 6)) + '/' +
+ (pDate.substring(6, 8));
+ }
+ return rtn;
+ }
+ // lt 20220419 End
/**
* add wangweipeng 2022/02/11
@@ -1047,13 +1068,13 @@
req.setEndpoint(endpoint);
req.setMethod('GET');
HTTPResponse response = http.send(req);
- String statusCode = response.getStatus();
+ String statusCode = String.valueof(response.getStatusCode());
System.debug('response:' + response);
//http锛氱姸鎬佸拰code
//濡傛灉鐘舵�佷笉閫氳繃 锛� 鍒欏皢鐘舵�佸強绌虹殑鐨勬暟鎹� 锛� 杩斿洖
- if (String.isNotBlank(statusCode)) {
- return new response(statusCode, null);
- }
+ // if (String.isNotBlank(statusCode)) {
+ // return new response(statusCode, null);
+ // }
System.debug('=====2======' + response.getBody());
//姝ｅ父鎵ц
return new response(statusCode, response.getBody());
@@ -1070,13 +1091,13 @@
req.setMethod('POST');
req.setBody(jsonStr);
HTTPResponse response = http.send(req);
- String statusCode = response.getStatus();
+ String statusCode = String.valueof(response.getStatusCode());
System.debug('response:' + response);
//http锛氱姸鎬佸拰code
//濡傛灉鐘舵�佷笉閫氳繃 锛� 鍒欏皢鐘舵�佸強绌虹殑鐨勬暟鎹� 锛� 杩斿洖
- if (String.isNotBlank(statusCode)) {
- return new response(statusCode, null);
- }
+ // if (String.isNotBlank(statusCode)) {
+ // return new response(statusCode, null);
+ // }
System.debug('=====2======' + response.getBody());
//姝ｅ父鎵ц
return new response(statusCode, response.getBody());
--
Gitblit v1.9.1