From 02ddc35714cbd1688b7cb057f770f1410de79dab Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 11 三月 2022 12:19:33 +0800
Subject: [PATCH] PIPL Updated Code 20220311
---
force-app/main/default/classes/NFM620Rest.cls | 54 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/force-app/main/default/classes/NFM620Rest.cls b/force-app/main/default/classes/NFM620Rest.cls
index 022d46c..6c67bbd 100644
--- a/force-app/main/default/classes/NFM620Rest.cls
+++ b/force-app/main/default/classes/NFM620Rest.cls
@@ -10,7 +10,10 @@
@RestResource(urlMapping = '/NFM620/*')
global with sharing class NFM620Rest {
//鏂板NFM620Rest 鍟嗗搧璇㈤棶鍗曟帴鏀舵暟鎹帴鍙� 绮剧悽鎶�鏈� start
-
+ //add to AWS 鍥炲 start sushanhu 20220225
+ static Boolean SFStatus=true;
+ static String SFMessage='';
+ //add to AWS 鍥炲 end sushanhu 20220225
global class GeDatas {
public NFMUtil.Monitoring Monitoring;
public GeData[] GeData;
@@ -26,6 +29,9 @@
public String Request; // 濮旀墭浜嬮」
public String RequestDetail; // 濮旀墭浜嬮」璇︾粏
public String ApproverID; // 瀹℃牳浜哄憳鍛樺伐缂栫爜
+ public String ContactWayEncrypted; //鑱旂郴鏂瑰紡瀵嗘枃 for pi
+ public String DataId; //AWS 鍔犲瘑鍑嵁
+ public Integer ContactType; //鑱旂郴鏂瑰紡 1涓洪偖绠� 2涓虹數璇�
}
@HttpPost
@@ -34,7 +40,7 @@
// 鍙栧緱鎺ュ彛浼犺緭鍐呭
String strData = RestContext.request.requestBody.toString();
GeDatas ges = (GeDatas) JSON.deserializeStrict(strData, GeDatas.class);
-
+ system.debug('rquest----'+strData);
if (ges == null ) {
return;
}
@@ -53,8 +59,16 @@
RestResponse res = RestContext.response;
res.addHeader('Content-Type', 'application/json');
res.statusCode = 200;
- String jsonResponse = '{"status": "Success", "Message":""}';
+ // 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;
}
@@ -128,7 +142,7 @@
if (String.isNotBlank(geData.Campaign)) {
camNoList.add(geData.Campaign);
}
-
+
geDataListNew.add(geData);
}
//浣跨敤缁熶竴鐢ㄦ埛ID鑾峰彇绉戝銆佹垬鐣ョ瀹ゅ垎绫汇�佺敤鎴峰鍚嶅苟瀛樺叆Map
@@ -177,12 +191,9 @@
}
}
}
-
-
-
// 灏哫ML鍚勬暟鎹」鏇存柊鍒板晢鍝佽闂崟瀵硅薄涓�
for (GeData geData : geDataListNew) {
-
+
Inquiry_form__c inquiry = new Inquiry_form__c();
inquiry.ComPlat_Name__c = geData.Name; //璇㈤棶鍗曞悕绉�
@@ -194,24 +205,26 @@
inquiry.ContactId__c = geData.ContactId; //缁熶竴鐢ㄦ埛ID
if (String.isNotBlank(ownerMap.get(geData.ApproverID))){
inquiry.OwnerId = ownerMap.get(geData.ApproverID); //鎵�鏈変汉
- }
+ }
+ inquiry.AWS_Data_Id__c =geData.DataId; //AWS鍔犲瘑鍑嵁 add 200220214
+
//濮旀墭浜嬮」鍙栧�煎悗鎷嗗垎
List<String> requestList = geData.Request.split(';');
String request1 = '';
for (String req11 : requestList) {
request1 += NFMUtil.getMapValue(transferMap, 'Request1__c', req11, iflog) + ';';
- }
+ }
inquiry.Request1__c = request1.substring(0, request1.length() - 1); //濮旀墭浜嬮」
-
+
//浣跨敤缁熶竴鐢ㄦ埛ID鑾峰彇绉戝銆佹垬鐣ョ瀹ゃ�佸鎴峰鍚�
if (conInfoMap.containsKey(geData.ContactId)) {
Contact contact = conInfoMap.get(geData.ContactId);
- inquiry.Hospital_Name__c = contact.Account.Id; //绉戝鍚�
- //inquiry.Department_Class__c = contact.Strategic_dept_Class__c; //鎴樼暐绉戝鍒嗙被
+ inquiry.Hospital_Name__c = contact.Account.Id; //绉戝鍚�
+ // inquiry.Department_Class__c = contact.Strategic_dept_Class__c; //鎴樼暐绉戝鍒嗙被
inquiry.Contact_Name__c = contact.Id; //瀹㈡埛濮撳悕
- //inquiry.OwnerId = contact.Strategic_dept_Class__r.OwnerId; //鎵�鏈変汉
- }
+ // inquiry.OwnerId = contact.Strategic_dept_Class__r.OwnerId; //鎵�鏈変汉
+ }
//浣跨敤甯傚満娲诲姩缂栫爜鑾峰彇甯傚満娲诲姩ID
if (String.isNotBlank(geData.Campaign)) {
if (String.isNotBlank(camInfoMap.get(geData.Campaign))) {
@@ -219,19 +232,24 @@
inquiry.LeadSource__c = '瀛︿細浼氳'; //璇㈤棶鍗曟潵婧�
} else {
iflog.ErrorLog__c += geData.InquiryNo + '锛氬競鍦烘椿鍔ㄧ紪鐮佷笉瀛樺湪銆俓n';
- continue;
+ continue;
}
} else {
inquiry.LeadSource__c = '鏅烘収鍖荤枟'; //璇㈤棶鍗曟潵婧�
}
- logstr += '鍜ㄨ鍗曟潵婧�:' + inquiry.LeadSource__c + '\n';
+ logstr += '鍜ㄨ鍗曟潵婧�:' + inquiry.LeadSource__c + '\n';
//鑱旂郴鏂瑰紡鐨勫�兼槸鍚﹀寘鍚獲鏉ュ垽鏂槸閭杩樻槸鐢佃瘽
- if (geData.ContactWay.contains('@')) {
+ if (geData.ContactType==1) {
inquiry.Phone__c = ''; //鐢佃瘽
+ inquiry.Phone_Encrypted__c=''; //鐢佃瘽瀵嗘枃 add 20220214
inquiry.Email__c = geData.ContactWay; //閭
+ inquiry.Email_Encrypted__c =geData.ContactWayEncrypted; //閭瀵嗘枃 add 20220214
+
} else {
inquiry.Phone__c = geData.ContactWay;
inquiry.Email__c = '';
+ inquiry.Email_Encrypted__c = ''; //閭瀵嗘枃 add 20220214
+ inquiry.Phone_Encrypted__c=geData.ContactWayEncrypted; //鐢佃瘽瀵嗘枃 add 20220214
}
if (String.isNotBlank(inqInfoMap.get(geData.InquiryNo))) {
--
Gitblit v1.9.1