From de9565270a88b0749d17c1961cd41399c8483c96 Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期一, 26 六月 2023 17:46:45 +0800
Subject: [PATCH] merge
---
force-app/main/default/classes/NFMUtil.cls | 101 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 97 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/classes/NFMUtil.cls b/force-app/main/default/classes/NFMUtil.cls
index eca54fb..d058c29 100644
--- a/force-app/main/default/classes/NFMUtil.cls
+++ b/force-app/main/default/classes/NFMUtil.cls
@@ -126,7 +126,7 @@
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';
@@ -189,7 +189,7 @@
NFM703_ENDPOINT = 'https://wdp.olympus.com.cn:44302/RESTAdapter/NFM703';
//鍏堟鍚庝慨
- NFM112_ENDPOINT = 'http://wdp.olympus.com.cn:8089/RESTAdapter/NFM112';
+ NFM112_ENDPOINT = 'https://wdp.olympus.com.cn:44302/RESTAdapter/NFM112';
//鏍锋湰绠＄悊
NFM115_ENDPOINT = 'https://wdp.olympus.com.cn:44302/RESTAdapter/NFM115';
@@ -197,7 +197,7 @@
NFM116_ENDPOINT = 'https://wdp.olympus.com.cn:44302/RESTAdapter/NFM116';
// 鐢靛瓙绛炬敹鍗昐FDC2SAP thh 20220427 end
- // 鏂版湇鍔＄郴缁�
+ // 鏂版湇鍔＄郴缁�
AWS_DOMAIN = 'https://svc-elb.olympuschina.com';
requestURILMS = '/v1/uc/user/syncOlympusUnit';
@@ -550,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;
}
@@ -1259,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) {
@@ -1280,6 +1305,74 @@
}
//鍙戦�佺粰鍏遍�氬钩鍙� 绮剧悽鎶�鏈� 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