From 0593d044698afa73e7e58022dab190ead1925f3a Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期六, 12 三月 2022 18:12:55 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/classes/NFM624Rest.cls | 56 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 11 deletions(-)
diff --git a/force-app/main/default/classes/NFM624Rest.cls b/force-app/main/default/classes/NFM624Rest.cls
index ad8dc2e..ada2b1b 100644
--- a/force-app/main/default/classes/NFM624Rest.cls
+++ b/force-app/main/default/classes/NFM624Rest.cls
@@ -10,6 +10,10 @@
@RestResource(urlMapping = '/NFM624/*')
global with sharing class NFM624Rest {
+ //add to AWS 鍥炲 start sushanhu 20220225
+ static Boolean SFStatus=true;
+ static String SFMessage='';
+ //add to AWS 鍥炲 end sushanhu 20220225
private static final String LOG_TYPE = 'NFM624';
// global class GeDatasRest {
// public GeDatas GeDatas;
@@ -21,13 +25,15 @@
}
global class GeData {
- public String ContactId; //缁熶竴骞冲彴ID
+ public String ContactId; //缁熶竴骞冲彴ID//Update to aws 瀛樺偍鐨凙WSContactId 20220225 SUSHANHU
public String ServiceUserId; //鏈嶅姟骞冲彴鐢ㄦ埛ID
public String PersonManagementCode; //浜哄憳绠＄悊缂栫爜
public String HospitalManagementCode2; //鍖婚櫌骞冲彴缂栫爜 骞冲彴缂栫爜 PlatformCode__c
public String DepartmentManagementCode2; //绉戝骞冲彴缂栫爜 骞冲彴缂栫爜 PlatformCode__c
public String Name; //濮撳悕
+ public String NameEncrypted;//濮撳悕瀵嗘枃 add 20220215
public String Mobile; //鎵嬫満鍙风爜
+ public String MobileEncrypted;//鎵嬫満鍙风爜瀵嗘枃 add 20220215
public String State; //鍗曚綅鎵�鍦ㄧ渷浠�
public String City; //甯�
public String AccountName; //鍖婚櫌鍚�
@@ -37,10 +43,12 @@
public String RelatedDepartment; //鍏宠仈SFDC绉戝 瀹㈡埛绠＄悊缂栫爜(鎵嬪啓) AgentCode_Ext__c
public String Type; //鑱岀
public String ContactAddress; //鑱旂郴鍦板潃
- public Boolean ForbiddenStatus; //骞冲彴鐢ㄦ埛绂佺敤鏍囪瘑
+ public String ContactAddressEncrypted;//鑱旂郴鍦板潃瀵嗘枃
+ public Boolean ForbiddenStatus; //骞冲彴鐢ㄦ埛绂佺敤鏍囪瘑
public String RegSource; //娉ㄥ唽骞冲彴鏉ユ簮
public Boolean AgentFlag; //缁忛攢鍟嗘爣璇�
public String ApproverID; //瀹℃牳浜哄憳鍛樺伐缂栫爜
+ public String DataId;//aws瀛樺偍鍑嵁
}
@HttpPost
@@ -49,7 +57,7 @@
// 鍙栧緱鎺ュ彛浼犺緭鍐呭
String strData = RestContext.request.requestBody.toString();
GeDatas ges = (GeDatas) JSON.deserializeStrict(strData, GeDatas.class);
-
+ system.debug('ges---'+ges);
if (ges == null) {
return;
@@ -71,8 +79,16 @@
RestResponse res = RestContext.response;
res.addHeader('Content-Type', 'application/json');
res.statusCode = 200;
- String jsonResponse = '{"status": "Success", "Message":""}';
- res.responseBody = blob.valueOf(jsonResponse);
+ // String jsonResponse = '{"status": "Success", "Message":""}';
+ // res.responseBody = blob.valueOf(jsonResponse);
+ //updata response toAWS 20220225 sushanhu start
+ NFMUtil.NFMResponse result = NFMUtil.getNFMResponse();
+ result.SFStatus=SFStatus;
+ result.SFMessage=SFMessage;
+ String jsonResponse =JSON.serialize(result);
+ system.debug('result---'+jsonResponse);
+ res.responseBody = blob.valueOf(jsonResponse);
+ //updata response toAWS 20220225 sushanhu end
return;
}
@@ -130,7 +146,11 @@
try { //鏍规嵁浼犺繃鏉ョ殑绠＄悊缂栫爜鏌ヨ濡傛灉鍙互鏌ヨ寰楀埌缁撴灉鍒欐洿鏂帮紝鏌ヨ涓嶅埌鍒欐柊澧�
List < Gedata > newGeDataList = new List < Gedata > ();
for (Gedata gedata: GeDataList) {
- string dataComplete = verify(gedata);
+ //for test
+ gedata.AgentFlag=false;
+ // string dataComplete = verify(gedata);
+ string dataComplete =null;
+ // test end for pi
if (!String.isBlank(dataComplete)) {
logstr += dataComplete;
rowData.Is_Error__c = 1;
@@ -282,12 +302,18 @@
ct.MobilePhone = gedata.Mobile;
ct.RegSource__c = comefrom;
ct.UnifiedI_Contact_ID__c = gedata.ContactId; //缁熶竴骞冲彴Id
+ // //UPDATE TO AWS 瀛樺偍鐨勭粺涓�骞冲彴id
+ // ct.AWS_UnifiedI_Contact_ID__c=gedata.ContactId; //缁熶竴骞冲彴Id
ct.ServicePlatformCode__c = gedata.ServiceUserId; //鏈嶅姟骞冲彴鐢ㄦ埛Id
ct.Contact_address__c = gedata.ContactAddress;//鑱旂郴鍦板潃
+ ct.Contact_address_Encrypted__c=gedata.ContactAddressEncrypted;//鑱旂郴鍦板潃瀵嗘枃 add 20220215
ct.Platform_disabled_representation__c = gedata.ForbiddenStatus;//骞冲彴绂佺敤鏍囪瘑
//ct.IsFromPlatform__c = true; //鏉ヨ嚜鏅烘収鍖荤枟鍒涘缓
ct.Ignore_Same_Name__c = true; //涓嶆槸閲嶅鐨勫鎴峰悕
//ct.SendToComPlat__c = true;
+ ct.AWS_Data_Id__c =gedata.DataId;//add 20220215 aws瀛樺偍鍑瘉
+ ct.MobilePhone_Encrypted__c =gedata.MobileEncrypted;//add 20220215 鎵嬫満瀵嗘枃
+ ct.LastName_Encrypted__c =gedata.NameEncrypted;//add 20220215 濮撳悕瀵嗘枃
String personCode = gedata.PersonManagementCode;
@@ -518,11 +544,19 @@
if (string.isblank(gda.Name)) {
result += 'DataError锛氬鍚嶄负绌篭n';
}
+ if (string.isblank(gda.NameEncrypted)) {
+ result += 'DataError锛氬鍚嶅瘑鏂囦负绌篭n';
+ }
if (string.isblank(gda.Mobile)) {
result += 'DataError锛氭墜鏈哄彿涓虹┖\n';
}
+ if (string.isblank(gda.MobileEncrypted)) {
+ result += 'DataError锛氭墜鏈哄彿瀵嗘枃涓虹┖\n';
+ }
if (string.isblank(gda.RegSource)) {
result += 'DataError锛氭敞鍐屽钩鍙版潵婧愪负绌篭n';
+ }if (string.isblank(gda.DataId)) {
+ result += 'DataError锛欰WS鍔犲瘑鍑嵁涓虹┖\n';
}
if (gda.AgentFlag) {
if (string.isblank(gda.PersonManagementCode)) {
@@ -618,12 +652,11 @@
List<Inquiry_form__c> InquiryList = [select Id,Inquiry_No__c,ContactId__c,Hospital_Name__c,Department_Class__c,Contact_Name__c from Inquiry_form__c where ContactId__c = :ContactId];
system.debug('InquiryList'+InquiryList);
//鏍规嵁缁熶竴鐢ㄦ埛Id鏌ヨ鑱旂郴浜�
- //select Id,Name,UnifiedI_Contact_ID__c,AccountId,Account.Name from Contact
List<Contact> contactList = [select Id,Name,UnifiedI_Contact_ID__c,Account.Id,Strategic_dept_Class__c,AccountId,Account.Name,Strategic_dept_Class__r.OwnerId from Contact where UnifiedI_Contact_ID__c = :ContactId];
- system.debug('contactList' + contactList);
-
+ system.debug('contactList' + contactList);
+
if(InquiryList.size()>0){
- //缁熶竴鐢ㄦ埛ID瀛樺叆List銆佽闂崟ID瀛楳ap
+ //缁熶竴鐢ㄦ埛ID瀛樺叆List銆佽闂崟ID瀛楳ap
Map<String, String> inquiryMap = new Map<String, String>();
//List<String> contactIdList = new List<String>();
for (Inquiry_form__c inquiryInfo : inquiryList) {
@@ -649,7 +682,8 @@
//琛ュ厖璇㈤棶鍗曢儴鍒� end
//琛ュ厖瀛︿細閮ㄥ垎 start
- List<CampaignMember__c> capMemList = [select Id,Contact_ID__c,Campaign__c,Campaign__r.Num__c,ViewContactId__c from CampaignMember__c where ViewContactId__c = :ContactId];
+ //List<CampaignMember__c> campaignMemberList = new List<CampaignMember__c>();
+ List<CampaignMember__c> capMemList = [select Id,Contact_ID__c,Campaign__c,Campaign__r.Num__c,ViewContactId__c from CampaignMember__c where Contact_ID__c = :ContactId];
if(capMemList.size() > 0){
system.debug('capMemList=================>'+capMemList);
Map<String, String> capMemMap = new Map<String, String>();
--
Gitblit v1.9.1