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/NFM607Rest.cls | 52 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/classes/NFM607Rest.cls b/force-app/main/default/classes/NFM607Rest.cls
index f75adf2..56ca865 100644
--- a/force-app/main/default/classes/NFM607Rest.cls
+++ b/force-app/main/default/classes/NFM607Rest.cls
@@ -3,7 +3,13 @@
*/
@RestResource(urlMapping = '/NFM607/*')
global with sharing class NFM607Rest {
+ //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 = 'NFM607';
+ //add Response to aws 20220221 add sushanhu
+ static NFMUtil.NFMResponse result = new NFMUtil.NFMResponse();
global class GeData {
public String mngCd; // ASE绠＄悊缂栫爜
@@ -21,10 +27,20 @@
public String activityStartTime; //娲诲姩寮�濮嬫椂闂�
public String activityEndTime; //娲诲姩缁撴潫鏃堕棿
public String workDesc; //宸ヤ綔鎻忚堪
- //add wangweipeng 2022/02/14 start
+ // add 鍔犲瘑瀛楁绱㈠紩 add 20220210
+ public String DataId; //鍔犲瘑瀛楁绱㈠紩
+ //add 鍔犲瘑瀛楁瀵嗘枃 20220210
+ public String customerNmEncrypted;
+ //add wangweipeng 2022/02/14 start
public String customerTel;//瀹㈡埛鎵嬫満鍙风爜
public String workPlace;//宸ヤ綔鍦烘墍
- //add wangweipeng 2022/02/14 end
+ //add wangweipeng 2022/02/14 end
+ //add 20220216 sushanhu start
+ public String customerTelEncrypted;
+ public String workPlaceEncrypted;
+ // add 20220216 sushanhu end
+
+
}
@HttpPost
@@ -32,7 +48,7 @@
// 鍙栧緱鎺ュ彛浼犺緭鍐呭
String strData = RestContext.request.requestBody.toString();
List < GeData > ges = (List < GeData > ) JSON.deserializeStrict(strData, List < GeData > .class);
-
+ system.debug('ges---'+ges);
if (ges == null) {
return;
}
@@ -52,8 +68,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;
}
@@ -105,7 +129,7 @@
if (String.isNotBlank(ged.departmentCd)) {
accountCodeList.add(ged.departmentCd);
}
-
+ system.debug('date---'+Date.valueOf(ged.activityDailyDate));
dateCalendarMap.put(Date.valueOf(ged.activityDailyDate), null);
}
@@ -166,11 +190,17 @@
ASEAct.VisitStaff__c = ged.customerNm;
ASEAct.ReporterASE__c = contactId;//鎶ュ憡鑰�
ASEAct.DurationInMinutes__c = getDurationInMinutes(ged);//鎸佺画鏃堕棿鍒嗛挓
+ activityIDStr += ged.activityID +'\n';
//add wangweipeng 2022/02/14 start
ASEAct.CustomerTel__c = ged.customerTel;//瀹㈡埛鎵嬫満鍙风爜
ASEAct.WorkPlace__c = ged.workPlace;//宸ヤ綔鍦烘墍
//add wangweipeng 2022/02/14 end
- activityIDStr += ged.activityID +'\n';
+ ASEAct.AWS_Data_Id__c =ged.DataId;//鍔犲瘑绱㈠紩 20220207
+ ASEAct.VisitStaffEncrypt__c=ged.customerNmEncrypted;//瀵嗘枃 20220207
+ //add sushanhu 2022/02/16 sart
+ ASEAct.CustomerTel_Encrypted__c=ged.customerTelEncrypted;
+ ASEAct.WorkPlace_Encrypted__c =ged.workPlaceEncrypted;
+ //add sushanhu 2022/02/16 end
upsertASEList.add(ASEAct);
}
@@ -329,9 +359,17 @@
if (String.isBlank(ged.visitDistinction) ) {
result += 'DataError: 鎷滆鍖哄垎 [ visitDistinction ] is null!\n';
}
+ // if (String.isBlank(ged.DataId) ) {
+ // result += 'DataError: 鍔犲瘑绱㈠紩 [ DataId ] is null!\n';
+ // }
+ // if (String.isBlank(ged.customerNmEncrypted)) {
+ // result += 'DataError: 瀹㈡埛濮撳悕瀵嗘枃 [ customerNmEncrypted ] is null!\n';
+ // }
+
if (String.isNotBlank(activityID) && String.isNotBlank(result)) {
result = activityID + result;
}
+
return result;
}
--
Gitblit v1.9.1