From fb04e7c01d119c60632b4298d18fd93f3ccb3d79 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期三, 06 四月 2022 10:32:05 +0800
Subject: [PATCH] 20220405DeployProduction
---
force-app/main/default/classes/NFM702Controller.cls | 73 +++++++++++++++++++++++++++---------
1 files changed, 55 insertions(+), 18 deletions(-)
diff --git a/force-app/main/default/classes/NFM702Controller.cls b/force-app/main/default/classes/NFM702Controller.cls
index bc18918..ca1b62b 100644
--- a/force-app/main/default/classes/NFM702Controller.cls
+++ b/force-app/main/default/classes/NFM702Controller.cls
@@ -39,6 +39,9 @@
public String HcpNo; //HPC缂栫爜
public Boolean IsActive; //鏄惁鏈夋晥
public String UpdateStatus; //鎿嶄綔绫诲瀷
+ // add by sushanhu 20220304 for pi satrt
+ public String DataId; //aws 瀛樺偍鍑嵁
+ // add by sushanhu 20220304 for pi end
}
@future(callout = true)
@@ -72,7 +75,8 @@
Phone, //鐢佃瘽
HcpNo__c, //HCP缂栫爜
Isactive__c, //鏄惁鏈夋晥
- UpdateStatus__c //鎿嶄綔绫诲瀷
+ // UpdateStatus__c, //鎿嶄綔绫诲瀷
+ AWS_Data_Id__c //aws 瀛樺偍鍑嵁 add bysushanhu 20220304 for Pi
from Contact WHERE Id IN:accIdList order by Id]; //AccountId
String logstr = iflog.Log__c + ' ' + 'NumberOfRecord=' + conList.size() + '\n';
@@ -97,7 +101,9 @@
ged.Mobile = con.Phone;
ged.HcpNo = con.HcpNo__c;
ged.IsActive = '鏈夋晥'.equals(con.Isactive__c)? true:false;
- ged.UpdateStatus = con.UpdateStatus__c;
+ // ged.UpdateStatus = con.UpdateStatus__c;
+ ged.UpdateStatus = String.isBlank(con.HcpNo__c) ? 'I' : 'U';
+ ged.DataId = con.AWS_Data_Id__c;//add by sushanhu for pi 20220304
gds.GeData.add(ged);
}
@@ -178,26 +184,56 @@
}
try {
- NFMUtil.response response = NFMUtil.sendToSapStatusAndBody(rowDataStr, NFMUtil.NFM702_ENDPOINT);
- System.debug('NFM702Log--status->'+ status);
+ // NFMUtil.response response = NFMUtil.sendToSapStatusAndBody(rowDataStr, NFMUtil.NFM702_ENDPOINT);
+ // System.debug('NFM702Log--status->'+ status);
+ // status = response.status;
+ // ResponseBody = response.responseBody;
+ // Response resultList = ( Response ) JSON.deserializeStrict(ResponseBody, Response.class);
+ // System.debug('NFM702Log--status->'+ ResponseBody);
+
+ // Result = resultList.Result.Result;
+
+ // if ('00'.equals(Result)) {
+ // logstr += ResponseBody+'\n';
+ // rowDataSFDC.retry_cnt__c = 0;
+ // //iflog.Log__c = 'ok';
+ // }
+ // else {
+ // //iflog.Log__c = 'ok2';
+ // rowDataSFDC = NFMUtil.LogAutoSend(rowDataSFDC, null, status);
+ // }
+ //update to AWS sushanhu FOR PI start 20220304
+ PIHelper.PIIntegration pi =PIHelper.getPIIntegrationInfo('NFM702');
+ NFMUtil.response response = NFMUtil.sendToPiAWS(rowDataStr, pi.newUrl,pi.token);
+
status = response.status;
+ System.debug('NFM702Log--status->'+ status);
+
ResponseBody = response.responseBody;
- Response resultList = ( Response ) JSON.deserializeStrict(ResponseBody, Response.class);
- System.debug('NFM702Log--status->'+ ResponseBody);
-
- Result = resultList.Result.Result;
-
- if ('00'.equals(Result)) {
- logstr += ResponseBody+'\n';
- rowDataSFDC.retry_cnt__c = 0;
- //iflog.Log__c = 'ok';
- }
- else {
- //iflog.Log__c = 'ok2';
+ System.debug('NFM702Log--responsebody->'+ ResponseBody);
+ if ('200'.equals(status)) {
+ //aws 姝ｇ‘鍝嶅簲
+ // Response resultList = ( Response ) JSON.deserializeStrict(ResponseBody, Response.class);
+ Map<String, Object> result = (Map<String, Object>)JSON.deserializeUntyped(ResponseBody);
+ String statusCode =(String)result.get('status');
+
+ if ('0'.equals(statusCode)) {
+ logstr += ResponseBody+'\n';
+ rowDataSFDC.retry_cnt__c = 0;
+ //iflog.Log__c = 'ok';
+ } else {
+ //iflog.Log__c = 'ok2';
rowDataSFDC = NFMUtil.LogAutoSend(rowDataSFDC, null, status);
+ }
}
+ else {
+
+ logstr=ResponseBody;
+ iflog.ErrorLog__c=ResponseBody;
+ }
+ //update to AWS sushanhu FOR PI 20220304 end
}catch ( Exception ex ) {
//鎵撳嵃閿欒鏃ュ織
System.debug(Logginglevel.ERROR, LOG_TYPE + iflog.Name + ':' + ex.getMessage());
@@ -206,8 +242,9 @@
logstr = ex.getMessage();
iflog.ErrorLog__c += ex.getMessage() + '\n';
iflog.ErrorLog__c += ex.getStackTraceString() + '\n';
-
- rowDataSFDC = NFMUtil.LogAutoSend(rowDataSFDC, null, status);
+ if(!Test.isRunningTest()){
+ //rowDataSFDC = NFMUtil.LogAutoSend(rowDataSFDC, null, status);
+ }
}
iflog.Log__c = iflog.Log__c + logstr;
--
Gitblit v1.9.1