From 1b3fb93f787b8b546a307bf063183f5295d183f8 Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期一, 26 六月 2023 16:53:25 +0800
Subject: [PATCH] merge
---
force-app/main/default/classes/NFMUtil.cls | 330 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 299 insertions(+), 31 deletions(-)
diff --git a/force-app/main/default/classes/NFMUtil.cls b/force-app/main/default/classes/NFMUtil.cls
index 4864541..d058c29 100644
--- a/force-app/main/default/classes/NFMUtil.cls
+++ b/force-app/main/default/classes/NFMUtil.cls
@@ -63,6 +63,9 @@
public static String NFM703_ENDPOINT = null;
public static String NFM115_ENDPOINT = null;
+ // 鐢靛瓙绛炬敹鍗昐FDC2SAP thh 20220427 start
+ public static String NFM116_ENDPOINT = null;
+ // 鐢靛瓙绛炬敹鍗昐FDC2SAP thh 20220427 end
public static String NFM112_ENDPOINT = null;
@@ -78,7 +81,8 @@
//NFM007_ENDPOINT = 'http://wdp.olympus.com.cn:8089/RESTAdapter/NFM007';
NFM007_ENDPOINT = 'https://wdp.olympus.com.cn:44301/RESTAdapter/NFM007';
NFM008_ENDPOINT = 'https://owdc-test.olympus.co.jp/XISOAPAdapter/MessageServlet?senderParty=&senderService=OCM_SFDC_T&receiverParty=&receiverService=&interface=NFM008_Sync_BC2GPI&interfaceNamespace=http%3A%2F%2Folympus.co.jp%2Fgpi%2FNFM008';
- NFM103_ENDPOINT = 'http://wdp.olympus.com.cn:8089/RESTAdapter/NFM103';
+ // NFM103_ENDPOINT = 'http://wdp.olympus.com.cn:8089/RESTAdapter/NFM103';
+ NFM103_ENDPOINT = 'https://sfpi-mebg-test.olympuschina.com/api/nfm/103';//aws 103鎺ュ彛
// NFM106_ENDPOINT = 'https://owdc-test.olympus.co.jp/XISOAPAdapter/MessageServlet?senderParty=&senderService=OCM_SFDC_T&receiverParty=&receiverService=&interface=NFM106_Sync_BC2GPI&interfaceNamespace=http%3A%2F%2Folympus.co.jp%2Fgpi%2FNFM106';
NFM106_ENDPOINT = 'http://wdp.olympus.com.cn:8089/RESTAdapter/NFM106';
//NFM106_ENDPOINT = 'https://sfdc-ocm-test.olympus.co.jp/XISOAPAdapter/MessageServlet?senderParty=&senderService=OCM_SFDC_T&receiverParty=&receiverService=&interface=NFM106_Sync_BC2GPI&interfaceNamespace=http%3A%2F%2Folympus.co.jp%2Fgpi%2FNFM106';
@@ -100,7 +104,7 @@
NFM401_ENDPOINT = 'http://ec2-161-189-3-104.cn-northwest-1.compute.amazonaws.com.cn:8088/dojtest/dojInfo/recevie';
NFM402_ENDPOINT = 'http://ec2-161-189-3-104.cn-northwest-1.compute.amazonaws.com.cn:8088/dojtest/dojInfo/getDojInfoByRefNo';
- NFM501_ENDPOINT = 'http://cusdata.qianlima.com/v1/info/page/';
+ NFM501_ENDPOINT = 'https://sfpi-mebg-test.olympuschina.com/api/nfm/501';
NFM502_ENDPOINT = 'http://cusdata.qianlima.com/v1/info/detailHtml?url=';
NFM504_ENDPOINT = 'http://cusdata.qianlima.com/v1/customer/albs/feedback';
CBPR_Auth_Sap = 'Basic U0ZEQ19XU1VTRVI6cG9xMTIzNDU=';
@@ -109,7 +113,7 @@
CBPR_Auth_Spo = 'http://cbpr.olympuschina.com/sfdc/token';
QLM_Token = 'http://cusdata.qianlima.com/v1/token';
-
+
// 鏅烘収鍖荤枟&鏈嶅姟鏂扮郴缁熼�氫俊 瀹㈡埛鎺ュ彛
NFM601_ENDPOINT = 'https://wdp.olympus.com.cn:44301/RESTAdapter/NFM601';
@@ -122,15 +126,22 @@
NFM702_ENDPOINT = 'https://wdp.olympus.com.cn:44301/RESTAdapter/NFM702';
NFM703_ENDPOINT = 'https://wdp.olympus.com.cn:44301/RESTAdapter/NFM703';
- NFM112_ENDPOINT = 'http://wdp.olympus.com.cn:8089/RESTAdapter/NFM112';
+ NFM112_ENDPOINT = 'https://wdp.olympus.com.cn:44301/RESTAdapter/NFM112';
NFM115_ENDPOINT = 'https://wdp.olympus.com.cn:44301/RESTAdapter/NFM115';
+
+ // sanbox鐢靛瓙绛炬敹鍗昐FDC2SAP thh 20220427 start
+ NFM116_ENDPOINT = 'https://wdp.olympus.com.cn:44301/RESTAdapter/NFM116';
+ // sanbox鐢靛瓙绛炬敹鍗昐FDC2SAP thh 20220427 end
+
// 鏂版湇鍔＄郴缁� 娴嬭瘯鐜
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';
+
requestURILMS = '/v1/uc/user/syncOlympusUnit';
appSecretLMS = 'CAE1D68BE3EB4F7AB5FE97EBDD11B83E';
@@ -157,7 +168,7 @@
NFM401_ENDPOINT = 'http://ec2-161-189-3-104.cn-northwest-1.compute.amazonaws.com.cn:8082/doj/dojInfo/recevie';
NFM402_ENDPOINT = 'http://ec2-161-189-3-104.cn-northwest-1.compute.amazonaws.com.cn:8082/doj/dojInfo/getDojInfoByRefNo';
- NFM501_ENDPOINT = 'http://cusdata.qianlima.com/v1/info/page/';
+ NFM501_ENDPOINT ='https://sfpi-mebg-test.olympuschina.com/api/nfm/501';
NFM502_ENDPOINT = 'http://cusdata.qianlima.com/v1/info/detailHtml?url=';
NFM504_ENDPOINT = 'http://cusdata.qianlima.com/v1/customer/albs/feedback';
CBPR_Auth_Sap = 'Basic U0ZEQ19XU1VTRVI6cG9wMTIzNDU=';
@@ -173,6 +184,18 @@
// 鏅烘収鍖荤枟&鏈嶅姟鏂扮郴缁熼�氫俊 鐢ㄦ埛鎺ュ彛
NFM621_ENDPOINT = 'https://wdp.olympus.com.cn:44302/RESTAdapter/NFM621';
NFM622_ENDPOINT = 'https://api-platform.olympuschina.com/prod-api/api/sso/sfdc_activitydata';
+ NFM701_ENDPOINT = 'https://wdp.olympus.com.cn:44302/RESTAdapter/NFM701';
+ NFM702_ENDPOINT = 'https://wdp.olympus.com.cn:44302/RESTAdapter/NFM702';
+ NFM703_ENDPOINT = 'https://wdp.olympus.com.cn:44302/RESTAdapter/NFM703';
+
+ //鍏堟鍚庝慨
+ NFM112_ENDPOINT = 'https://wdp.olympus.com.cn:44302/RESTAdapter/NFM112';
+ //鏍锋湰绠＄悊
+ NFM115_ENDPOINT = 'https://wdp.olympus.com.cn:44302/RESTAdapter/NFM115';
+
+ // 鐢靛瓙绛炬敹鍗昐FDC2SAP thh 20220427 start
+ NFM116_ENDPOINT = 'https://wdp.olympus.com.cn:44302/RESTAdapter/NFM116';
+ // 鐢靛瓙绛炬敹鍗昐FDC2SAP thh 20220427 end
// 鏂版湇鍔＄郴缁�
AWS_DOMAIN = 'https://svc-elb.olympuschina.com';
@@ -224,7 +247,27 @@
webservice String timestamp;
webservice String appKey;
}
-
+ // add to aws response sushanhu 20220224 start
+ global class NFMResponse{
+ public Boolean SFStatus;
+ public String SFMessage;
+ public StaticResponse staticResponse;
+ }
+ global class StaticResponse{
+ public string status;
+ public String Message;
+ public StaticResponse(){
+ status='Success';
+ Message='';
+ }
+ }
+ public static NFMResponse getNFMResponse(){
+ NFMResponse result=new NFMResponse();
+ result.staticResponse =new StaticResponse();
+ return result;
+
+ }
+// add to aws response sushanhu 20220224 end
/**
* @return yyyyMMdd 銇棩浠樻枃瀛楀垪
*/
@@ -260,6 +303,33 @@
}
return rtn + '000000';
}
+
+ /**
+ * [formatDate2StrDateNewTime description]
+ * @param dt [鏃ユ湡]
+ * @return [description]
+ * 鎷兼帴鏃ユ湡/鏃堕棿锛屽弬鏁版棩鏈燂紙骞存湀鏃ワ級+ 褰撳墠鏃堕棿锛堟椂鍒嗙锛�
+ */
+ public static String formatDate2StrDateNewTime(Date dt) {
+ String rtn = null;
+ if (dt == null) {
+ return rtn;
+ }
+ rtn = String.valueOf(dt);
+ rtn = rtn.replaceAll('-', '');
+ if (rtn >= '40001231') {
+ rtn = '99991231';
+ } else if (rtn < '19000101') {
+ rtn = '19000101';
+ }
+
+ String phourMinuteSecond = String.valueOf(DateTime.now());
+ if(phourMinuteSecond.length() >= 19){
+ phourMinuteSecond = phourMinuteSecond.subString(10,19).replaceall(':', '');
+ }
+ return rtn + phourMinuteSecond;
+ }
+
/**
* @return yyyyMMddHHmmss 銇棩浠樻枃瀛楀垪
@@ -310,7 +380,25 @@
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
* [formatDateTime2StrDateTime description]
* @param dt [鏃ユ湡/鏃堕棿]
@@ -343,6 +431,27 @@
}
return parseStr2Date(pDateTime.substring(0, 8));
}
+
+ /**
+ * add wangweipeng 2022/02/15
+ * [parseStr2DateTime description]
+ * @param pDate [鏃ユ湡锛堜笉鍖呮嫭鏃堕棿锛塢
+ * @return [description]
+ *
+ * 鎷兼帴鏃ユ湡/鏃堕棿锛屽叾涓棩鏈熶负鐪熷疄鏃ユ湡锛屾椂闂翠负褰撳墠鏃堕棿
+
+ */
+ public static Datetime parseStr3DateTime(String pDate) {
+ if (String.isBlank(pDate)) {
+ return null;
+ }
+ String phourMinuteSecond = String.valueOf(DateTime.now());
+ if(phourMinuteSecond.length() >= 19){
+ phourMinuteSecond = phourMinuteSecond.subString(10,19).replaceall(':', '');
+ }
+ return parseStr2DateTime(pDate.substring(0, 8), phourMinuteSecond);
+ }
+
public static Datetime parseStr2DateTime(String pDateTime) {
if (pDateTime == null || pDateTime.length() != 14) {
return null;
@@ -364,13 +473,13 @@
return null;
}
rtn = Datetime.newinstance(
- Integer.valueOf(pDate.substring(0, 4)),
- Integer.valueOf(pDate.substring(4, 6)),
- Integer.valueOf(pDate.substring(6, 8)),
- Integer.valueOf(pTime.substring(0, 2)),
- Integer.valueOf(pTime.substring(2, 4)),
- Integer.valueOf(pTime.substring(4, 6))
- );
+ Integer.valueOf(pDate.substring(0, 4)),
+ Integer.valueOf(pDate.substring(4, 6)),
+ Integer.valueOf(pDate.substring(6, 8)),
+ Integer.valueOf(pTime.substring(0, 2)),
+ Integer.valueOf(pTime.substring(2, 4)),
+ Integer.valueOf(pTime.substring(4, 6))
+ );
} catch (Exception ex) {
System.debug(Logginglevel.ERROR, 'NFMUtil#parseStr2DateTime(' + pDate + ', ' + pTime + ')' + ex.getMessage());
}
@@ -400,10 +509,10 @@
return null;
}
rtn = Date.newinstance(
- Integer.valueOf(pStr.substring(0, 4)),
- Integer.valueOf(pStr.substring(4, 6)),
- Integer.valueOf(pStr.substring(6, 8))
- );
+ Integer.valueOf(pStr.substring(0, 4)),
+ Integer.valueOf(pStr.substring(4, 6)),
+ Integer.valueOf(pStr.substring(6, 8))
+ );
} catch (Exception ex) {
System.debug(Logginglevel.ERROR, 'NFMUtil#parseStr2Date(' + pStr + ')' + ex.getMessage());
}
@@ -441,7 +550,7 @@
col = '';
}
rtn = transferMap.get(col + key);
- if (rtn == null) {
+ if (!transferMap.containsKey(col + key)) { //lt 20220530 update
iflog.ErrorLog__c += 'Warning! Please check [' + col + '] can not transfer key [' + key + ']\n';
rtn = key;
}
@@ -549,7 +658,7 @@
return rowData;
}
- // public static BatchIF_Log__c makeRowDataToOnline(NFMUtil.MonitoringToOnline Monitoring, String NFMType, Object NFMData) {
+ // public static BatchIF_Log__c makeRowDataToOnline(NFMUtil.MonitoringToOnline Monitoring, String NFMType, Object NFMData) {
// BatchIF_Log__c rowData = new BatchIF_Log__c();
// rowData.Type__c = NFMType;
// rowData.MessageGroupNumber__c = Monitoring.MessageGroupNumber;
@@ -816,7 +925,30 @@
system.debug('ress:' + ress);
return new response(ress, resb);
}
+ // send to aws to sap sushuanhu 20220222
+ public static response sendToPiAWS(String rowDataStr, String endpoint,String awsToken) {
+ Http http = new Http();
+ HttpRequest req = new HttpRequest();
+ HTTPResponse res;
+ String resb;
+ req.setTimeout(120000);
+ req.setEndpoint(endpoint);
+ req.setMethod('POST');
+ req.setHeader('Content-Type', 'application/json');
+ req.setHeader('pi-token', awsToken);
+ req.setBody(rowDataStr);
+ res = http.send(req);
+ string ress =String.valueof(res.getStatusCode());
+ resb = res.getBody();
+ system.debug('ress:' + ress);
+ return new response(ress, resb);
+ }
+ // 鑾峰彇aws token sushanhu 20220222
+ public static response getAwsToken(){
+ String responseBody = AWSServiceTool.getAWSToken();
+ return new response('success', responseBody);
+ }
public class response {
public string status;
public string responseBody;
@@ -854,10 +986,10 @@
return null;
}
return Time.newInstance(
- Integer.valueOf(timeStr.substring(0, 2)),
- Integer.valueOf(timeStr.substring(2, 4)),
- Integer.valueOf(timeStr.substring(4, 6)),
- 0);
+ Integer.valueOf(timeStr.substring(0, 2)),
+ Integer.valueOf(timeStr.substring(2, 4)),
+ Integer.valueOf(timeStr.substring(4, 6)),
+ 0);
}
//insert by rentongxiao 2020-10-12 end
@@ -878,8 +1010,8 @@
//1銆� 鑾峰彇token:
Http http = new Http();
HttpRequest req = new HttpRequest();
- String content = 'appKey=' + EncodingUtil.urlEncode(appKey, 'UTF-8') +
- '&appSecret=' + EncodingUtil.urlEncode(appSecret, 'UTF-8');
+ String content = 'appKey=' + EncodingUtil.urlEncode(appKey, 'UTF-8') +
+ '&appSecret=' + EncodingUtil.urlEncode(appSecret, 'UTF-8');
//璇锋眰璺緞
req.setEndpoint(QLM_Token);
req.setHeader('Content-Type', QLM_NFM501_Point);
@@ -937,6 +1069,51 @@
//姝ｅ父鎵ц
return new response(ress, response.getBody());
}
+ // NEW QLM AWS 501 鎺ュ彛 sushanhu 20220223
+ public static response getAWSQLMData(String endpoint, String token) {
+ //2銆佽幏鍙栨嫑鏍囦俊鎭細璁板緱浣跨敤1涓幏鍙栫殑token
+ Http http = new Http();
+ HttpRequest req = new HttpRequest();
+ req.setHeader('Content-Type', 'application/json');
+ req.setHeader('pi-token', token);
+ req.setTimeout(120000);
+ req.setEndpoint(endpoint);
+ req.setMethod('GET');
+ HTTPResponse response = http.send(req);
+ String statusCode = String.valueof(response.getStatusCode());
+ System.debug('response:' + response);
+ //http锛氱姸鎬佸拰code
+ //濡傛灉鐘舵�佷笉閫氳繃 锛� 鍒欏皢鐘舵�佸強绌虹殑鐨勬暟鎹� 锛� 杩斿洖
+ // if (String.isNotBlank(statusCode)) {
+ // return new response(statusCode, null);
+ // }
+ System.debug('=====2======' + response.getBody());
+ //姝ｅ父鎵ц
+ return new response(statusCode, response.getBody());
+ }
+ // NEW QLM AWS 502 503鎺ュ彛 sushanhu 20220223
+ public static response getAWSQLMData(String endpoint,String jsonStr, String token) {
+ //2銆佽幏鍙栨嫑鏍囦俊鎭細璁板緱浣跨敤1涓幏鍙栫殑token
+ Http http = new Http();
+ HttpRequest req = new HttpRequest();
+ req.setHeader('Content-Type', 'application/json');
+ req.setHeader('pi-token', token);
+ req.setTimeout(120000);
+ req.setEndpoint(endpoint);
+ req.setMethod('POST');
+ req.setBody(jsonStr);
+ HTTPResponse response = http.send(req);
+ String statusCode = String.valueof(response.getStatusCode());
+ System.debug('response:' + response);
+ //http锛氱姸鎬佸拰code
+ //濡傛灉鐘舵�佷笉閫氳繃 锛� 鍒欏皢鐘舵�佸強绌虹殑鐨勬暟鎹� 锛� 杩斿洖
+ // if (String.isNotBlank(statusCode)) {
+ // return new response(statusCode, null);
+ // }
+ System.debug('=====2======' + response.getBody());
+ //姝ｅ父鎵ц
+ return new response(statusCode, response.getBody());
+ }
//鎺ュ彛3锛岃幏鍙栧叾浠栭檮浠�
public static response503 getFileData(String token503, String endpoint) {
@@ -983,7 +1160,7 @@
public static String sendTenInfo(String token504, String jsonStr, String endpoint) {
Http http = new Http();
HttpRequest req = new HttpRequest();
- req.setEndpoint('http://cusdata.qianlima.com/test/v1/customer/albs/feedback');
+ req.setEndpoint(endpoint);
req.setHeader('open-authorization', 'Bearer' + token504);
req.setHeader('Content-Type', 'application/x-www-form-urlencoded');
req.setMethod('POST');
@@ -1082,6 +1259,31 @@
}
return rowDataSFDC;
}
+ // 2022-12-06 zyh add start DB202211540694-閲嶅彂鍙彂鑷繁
+ public static BatchIF_Log__c LogAutoSend(BatchIF_Log__c rowDataSFDC, Exception ex, String status, Boolean check){
+ Integer batch_retry_max_cnt = Integer.valueOf(System.Label.batch_retry_max_cnt);
+ if (rowDataSFDC.retry_cnt__c == null) rowDataSFDC.retry_cnt__c = 0;
+ if (rowDataSFDC.retry_cnt__c < batch_retry_max_cnt){
+ rowDataSFDC.retry_cnt__c++;
+ // 20230131 ljh start
+ // LogAutoSendSchedule.logId = rowDataSFDC.Id; // 璧嬪�兼湰鏃ュ織Id
+ // LogAutoSendSchedule.messageGroupNumber = rowDataSFDC.MessageGroupNumber__c; // messagenum鍙疯祴鍊� 2023-01-19 zyh add
+ // LogAutoSendSchedule.type = rowDataSFDC.Type__c; // 璧嬪�兼湰鏃ュ織type 2023-01-19 zyh add
+ System.debug('NFM鎺ュ彛娴嬭瘯==========>Id锛�' + rowDataSFDC.Id + ';===MessageGroupNumber锛�' + rowDataSFDC.MessageGroupNumber__c + ';===Type' + rowDataSFDC.Type__c);
+ // LogAutoSendSchedule.assignOneMinute();
+ LogAutoSendSchedule.assignOneMinute(rowDataSFDC.MessageGroupNumber__c,rowDataSFDC.Type__c);
+ // 20230131 ljh end
+ }
+ if (rowDataSFDC.retry_cnt__c >= batch_retry_max_cnt){
+ if (ex == null) {
+ rowDataSFDC.ErrorLog__c = status + '\n閿欒娆℃暟宸茬粡瓒呰繃鑷姩閫佷俊璁惧畾鐨勬渶澶ф鏁帮紝璇锋墜鍔ㄩ�佷俊';
+ } else {
+ rowDataSFDC.ErrorLog__c = ex.getMessage() + '\n' + ex.getStackTraceString() + '\n' + rowDataSFDC.ErrorLog__c+'閿欒娆℃暟宸茬粡瓒呰繃鑷姩閫佷俊璁惧畾鐨勬渶澶ф鏁帮紝璇锋墜鍔ㄩ�佷俊';
+ }
+ }
+ return rowDataSFDC;
+ }// 寤鸿浠ュ悗閲嶅彂璋冪敤姝ゆ柟娉�
+ // 2022-12-06 zyh add end DB202211540694-閲嶅彂鍙彂鑷繁
// https://oly.ngrok.kunchuangtech.net/api/sso/sfdc_activitydata
//鍙戦�佺粰鍏遍�氬钩鍙� 绮剧悽鎶�鏈� thh 2021-09-22 start
public static String sendToComPlat(String rowDataStr, String endpoint) {
@@ -1101,10 +1303,76 @@
system.debug('resb:' + resb);
return resb;
}
-
-
//鍙戦�佺粰鍏遍�氬钩鍙� 绮剧悽鎶�鏈� thh 2021-09-22 end
-
+
+ //zhj batch 璋冪敤624鎺ュ彛鐨勬椂鍊� 闇�瑕佽皟鐢ˋWS 2023-01-08 start
+ public static void batchSendToAWS624(String rowDataId) {
+ System.debug('enter batchSendToAWS624');
+ BatchIF_Log__c rowData = [Select Id, Name, Log__c,Is_Error__c, ErrorLog__c, Log2__c, Log3__c, Log4__c, Log5__c, Log6__c, Log7__c, Log8__c, Log9__c, Log10__c, Log11__c, Log12__c, MessageGroupNumber__c, retry_cnt__c,NFM624_Secondary_processing__c from BatchIF_Log__c where RowDataFlg__c = true and Id =: rowDataId];
+ String rowDataStr = getRowDataStr(rowData);
+ List < NFM624Rest2.GeData > GeDataList = (List < NFM624Rest2.GeData > ) JSON.deserialize(rowDataStr, List < NFM624Rest2.GeData > .class);
+ Http http = new Http();
+ HttpRequest request = new HttpRequest();
+ PIHelper.PIIntegration documentPI=PIHelper.getPIIntegrationInfo('Document');
+ String hostUrl = documentPI.hostUrl;
+ System.debug('GeDataList[0].nfm624RequestId = ' + GeDataList[0].nfm624RequestId);
+ System.debug('documentPI.hostUrl = ' + documentPI.hostUrl);
+ System.debug('documentPI.token = ' + documentPI.token);
+ request.setEndpoint(hostUrl + '/api/nfm/reCallNFM624Batch?nfm624RequestId=' + GeDataList[0].nfm624RequestId + '&rowDataId=' + rowDataId);
+ request.setMethod('GET');
+ request.setHeader('pi-token',documentPI.token);
+ HttpResponse response = http.send(request);
+ System.debug('send batchSendToAWS624');
+ }
+ //zhj batch 璋冪敤624鎺ュ彛鐨勬椂鍊� 闇�瑕佽皟鐢ˋWS 2023-01-08 end
+
+ //zhj 閲嶆柊 璋冪敤624鎺ュ彛鐨勬椂鍊� 璋冪敤AWS 2023-01-11 start
+ public static void againSendToAWS624(String rowDataId) {
+ if(!Test.isRunningTest()){
+ System.debug('enter againSendToAWS624');
+ BatchIF_Log__c rowData = [Select Id, Name, Log__c,Is_Error__c, ErrorLog__c, Log2__c, Log3__c, Log4__c, Log5__c, Log6__c, Log7__c, Log8__c, Log9__c, Log10__c, Log11__c, Log12__c, MessageGroupNumber__c, retry_cnt__c,NFM624_Secondary_processing__c from BatchIF_Log__c where RowDataFlg__c = true and Id =: rowDataId];
+ String rowDataStr = getRowDataStr(rowData);
+ List < NFM624Rest2.GeData > GeDataList = (List < NFM624Rest2.GeData > ) JSON.deserialize(rowDataStr, List < NFM624Rest2.GeData > .class);
+ Http http = new Http();
+ HttpRequest request = new HttpRequest();
+ PIHelper.PIIntegration documentPI=PIHelper.getPIIntegrationInfo('Document');
+ String hostUrl = documentPI.hostUrl;
+ System.debug('GeDataList[0].nfm624RequestId = ' + GeDataList[0].reCallNfm624RequestId);
+ System.debug('documentPI.hostUrl = ' + documentPI.hostUrl);
+ System.debug('documentPI.token = ' + documentPI.token);
+ request.setEndpoint(hostUrl + '/api/nfm/reCallNFM624?reCallNfm624RequestId=' + GeDataList[0].reCallNfm624RequestId + '&rowDataId=' + rowDataId);
+ request.setMethod('GET');
+ request.setHeader('pi-token',documentPI.token);
+ HttpResponse response = http.send(request);
+ System.debug('send againSendToAWS624');
+ }
+ }
+ //zhj 閲嶆柊 璋冪敤624鎺ュ彛鐨勬椂鍊� 璋冪敤AWS 2023-01-11 end
+
+ //zhj 鏂版柟妗堟敼閫� 624Batch鏇存柊鏃ュ織 灏嗘棩蹇楀唴瀹规洿鏂板埌rowdata閲岄潰 2023-01-09 start
+ public static BatchIF_Log__c updateRowData(String rowDataId, Object NFMData) {
+ BatchIF_Log__c rowData = [Select Id, Name, Log__c,Is_Error__c, ErrorLog__c, Log2__c, Log3__c, Log4__c, Log5__c, Log6__c, Log7__c, Log8__c, Log9__c, Log10__c, Log11__c, Log12__c, MessageGroupNumber__c, retry_cnt__c,NFM624_Secondary_processing__c from BatchIF_Log__c where Id =: rowDataId];
+ String rowDataStr = JSON.serialize(NFMData);
+ if (rowDataStr.length() > 0) {
+ Integer splitIdx = 1;
+ while (rowDataStr.length() > 0) {
+ if (splitIdx == 1) {
+ rowData.put('Log__c', rowDataStr.substring(0, (rowDataStr.length() > MaxLogColumnLength ? MaxLogColumnLength : rowDataStr.length())));
+ } else if (splitIdx == 13) {
+ rowData.ErrorLog__c = rowDataStr;
+ break;
+ } else {
+ rowData.put('Log' + splitIdx + '__c', rowDataStr.substring(0, (rowDataStr.length() > MaxLogColumnLength ? MaxLogColumnLength : rowDataStr.length())));
+ }
+ splitIdx++;
+ rowDataStr = rowDataStr.substring((rowDataStr.length() > MaxLogColumnLength ? MaxLogColumnLength : rowDataStr.length()));
+ }
+ }
+ update rowData;
+ return rowData;
+ }
+ //zhj 鏂版柟妗堟敼閫� 624Batch鏇存柊鏃ュ織 灏嗘棩蹇楀唴瀹规洿鏂板埌rowdata閲岄潰 2023-01-09 end
+
public static Integer ControllerUtil() {
Integer i = 0;
i++;
--
Gitblit v1.9.1