From fd2184ee47221684ceccf93b7a65428835055253 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期三, 06 四月 2022 11:55:06 +0800
Subject: [PATCH] Merge branch 'PIPLDeploy0405'
---
force-app/main/default/classes/NFM606Controller.cls | 49 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/force-app/main/default/classes/NFM606Controller.cls b/force-app/main/default/classes/NFM606Controller.cls
index 9d62d6e..9b2dd95 100644
--- a/force-app/main/default/classes/NFM606Controller.cls
+++ b/force-app/main/default/classes/NFM606Controller.cls
@@ -5,7 +5,10 @@
public without sharing class NFM606Controller {
public static String logstr;
- public static String status;
+ public static String status;
+ //add aws respnse sushanhu 20220228 start
+ public static String responseBody;
+ //add aws respnse sushanhu 20220228 end
private static final String LOG_TYPE = 'NFM606';
private static final String API = '/admin/api/user/save';
public class NFM606 {
@@ -33,6 +36,9 @@
public String AgentCode; //缁忛攢鍟嗙紪鐮�
public String AgentUserType; //浜哄憳绫诲瀷
public String Email; //鐢靛瓙閭欢
+ //add aws pi start sushanhu 20220228
+ public String DataId;//aws 瀛樺偍鍑嵁
+ //add aws pi end sushanhu 20220228
}
@@ -104,6 +110,7 @@
Account.ParentId,
Account.Parent.ParentId,
UniqueNumber__c,
+ AWS_Data_Id__c,
Name, Email from Contact where id in: conIdList AND RecordTypeId != '01210000000QtkyAAC'
];
String logstr = iflog.Log__c + ' ' + 'NumberOfRecord=' + conList.size() + '\n';
@@ -112,11 +119,14 @@
String flag = '';
GeData ged = new GeData();
ged.ContactId = String.isBlank(con.UnifiedI_Contact_ID__c) ? '':con.UnifiedI_Contact_ID__c; //鏅烘収鍖荤枟ID
+ //update to AWS_UnifiedI_Contact_ID__c sushanhu 20220228 start
+ //ged.ContactId = String.isBlank(con.) ? '':con.AWS_UnifiedI_Contact_ID__c; //AWS 鏅烘収鍖荤枟ID
+ ////update to AWS_UnifiedI_Contact_ID__c sushanhu 20220228 end
ged.ServiceUserId = String.isBlank(con.ServicePlatformCode__c) ? '':con.ServicePlatformCode__c; //鏈嶅姟骞冲彴鐢ㄦ埛ID???
ged.Mobile = String.isNotBlank(con.UniqueNumber__c) ? con.UniqueNumber__c:con.MobilePhone;//鎵嬫満
ged.PersonManagementCode = con.CManageCode__c; //浜哄憳绠＄悊缂栫爜
ged.Status = '鏈夋晥'.equals(con.Isactive__c) ? true:false ;//鐘舵��
- ged.Name = '';//濮撳悕
+ ged.Name = con.Name;//濮撳悕
ged.Email = '';
ged.Hospital =''; //鍖婚櫌缂栫爜
ged.Department = ''; //绉戝缂栫爜
@@ -136,13 +146,14 @@
}
// 缁忛攢鍟�
if ('01210000000QfWiAAK'.equals(con.RecordTypeId)) {
- ged.Name = con.Name;//濮撳悕
+ //ged.Name = con.Name;//濮撳悕
ged.Account = con.Account.Name;//缁忛攢鍟嗗悕
ged.AgentCode = con.Account.Management_Code__c;//缁忛攢鍟嗙紪鐮�
ged.AgentUserType = String.isBlank(con.ContactType__c) ? '': con.ContactType__c.replaceAll(';',',');//浜哄憳绫诲瀷
ged.AgentFlag = true;//缁忛攢鍟�
ged.Email = con.Email;
}
+ ged.DataId =con.AWS_Data_Id__c;//add aws 瀛樺偍鍑嵁
ged = getStateAndCity(ged,con);
gds.GeData.add(ged);
@@ -259,17 +270,35 @@
try {
- // 鍙戝線PO
- status = NFMUtil.sendToSapRet(rowDataStr, NFMUtil.NFM606_ENDPOINT);
- System.debug('NFM606Log--status->'+ status);
- // status = ''
- if ('Accepted'.equals(status)) {
+ // // 鍙戝線PO
+ // status = NFMUtil.sendToSapRet(rowDataStr, NFMUtil.NFM606_ENDPOINT);
+ // System.debug('NFM606Log--status->'+ status);
+ // // status = ''
+ // if ('Accepted'.equals(status)) {
+ // logstr += status+'\n';
+ // rowDataSFDC.retry_cnt__c = 0;
+ // }
+ // else {
+ // rowDataSFDC = NFMUtil.LogAutoSend(rowDataSFDC, null, status);
+ // }
+ //update to aws 20220228 sushanhu satrt
+ PIHelper.PIIntegration pi =PIHelper.getPIIntegrationInfo('NFM606');
+ NFMUtil.response result =NFMUtil.sendToPiAWS(rowDataStr,pi.newUrl,pi.token);
+ system.debug('aws result---'+result);
+ responseBody=result.responseBody;
+ //Map<String, Object> res = (Map<String, Object>)JSON.deserializeUntyped(responseBody);
+ //status=(String)res.get(status);
+ status =result.status;
+ system.debug('stadtucode--'+result.status);
+ if ('202'.equals(status)) {
logstr += status+'\n';
- rowDataSFDC.retry_cnt__c = 0;
- }
+ rowDataSFDC.retry_cnt__c = 0;
+ }
else {
+ logstr+=responseBody+'\n';
rowDataSFDC = NFMUtil.LogAutoSend(rowDataSFDC, null, status);
}
+ //update to aws 20220228 sushanhu end
} catch (Exception ex) {
// TODO IOException
// 寮傚父閲嶅彂
--
Gitblit v1.9.1