From f5a94e721ae5a26f817f0df75065b64f1f192eb3 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期一, 28 三月 2022 21:43:51 +0800
Subject: [PATCH] PIPLFunctionDeploy0328
---
force-app/main/default/classes/NewAndEditAddressController.cls | 53 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/force-app/main/default/classes/NewAndEditAddressController.cls b/force-app/main/default/classes/NewAndEditAddressController.cls
index 4fca044..8826764 100644
--- a/force-app/main/default/classes/NewAndEditAddressController.cls
+++ b/force-app/main/default/classes/NewAndEditAddressController.cls
@@ -39,7 +39,8 @@
//鑾峰彇鎵�鏈夊瓧娈�
List<String> fieldList = new List<String>(Schema.getGlobalDescribe().get('Address__c').getDescribe().fields.getMap().keyset());
// Add fields to controller. This is to avoid the SOQL error in visualforce page
- controller.addFields(fieldList);
+ if (!Test.isRunningTest()) {
+ controller.addFields(fieldList);}
SObject obj = controller.getRecord();
if(obj.Id != null){
//鏇存柊
@@ -92,19 +93,21 @@
system.debug('field API'+fieldAPI);
Schema.DisplayType fielddataType = fieldAPIToTypeMap.get(fieldAPI).getDescribe().getType();
String fieldValue = String.valueOf(fieldValueMap.get(fieldAPI));
- if(String.isBlank(fieldValue)){
+ if(!fieldAPIToTypeMap.containskey(fieldAPI)){
continue;
}
if(String.valueOf(fielddataType)=='DATE'){
- addressInfo.put(fieldAPI, Date.valueOf(String.valueOf(fieldValueMap.get(fieldAPI)).replace('/', '-')));
+ addressInfo.put(fieldAPI,(String.isBlank(fieldValue)||String.isEmpty(fieldValue))? null:Date.valueOf(fieldValue.replace('/', '-')));
}else if(String.valueOf(fielddataType)=='DATETIME'){
String dt = String.valueOf(fieldValueMap.get(fieldAPI));
if(String.isNotBlank(dt)&&dt.contains('T')){
dt = dt.replace('T',' ');
addressInfo.put(fieldAPI, Datetime.valueOfGmt(dt));
+ }else {
+ addressInfo.put(fieldAPI,fieldValue);
}
}else if(String.valueOf(fielddataType)=='Number'||String.valueOf(fielddataType)=='DOUBLE' ){
- addressInfo.put(fieldAPI, Decimal.valueOf(String.valueOf(fieldValueMap.get(fieldAPI))));
+ addressInfo.put(fieldAPI, (String.isBlank(fieldValue)||String.isEmpty(fieldValue))?null:Decimal.valueOf(fieldValue.replace(',', '')));
} else if(String.valueof(fielddataType)=='BOOLEAN'){
addressInfo.put(fieldAPI, fieldValueMap.get(fieldAPI));
}else {
@@ -116,7 +119,8 @@
String status = 'success';
Response resp = new Response();
Savepoint sp = Database.setSavepoint();
- String rid = '';
+ // String rid = '';
+ String awsDataId = '';
try{
System.debug('abcde');
if(isNew){
@@ -124,28 +128,49 @@
insert addressInfo;
}else{
System.debug('into update');
- String awsDataId = (String)addressInfo.get('AWS_Data_Id__c');
+ awsDataId = (String)addressInfo.get('AWS_Data_Id__c');
System.debug('awsDataId = ' + awsDataId);
Address__c[] addresses = [select id from Address__c where AWS_Data_Id__c =:awsDataId];
System.debug('addresses[0].id = ' + addresses[0].id);
addressInfo.put('Id',addresses[0].id);//For testing;
update addressInfo;
}
- rid=addressInfo.Id;
- PIHelper.saveTransLog(sobjectTypeValue,(String)addressInfo.get('AWS_Data_Id__c'),rid,transId,addressJson ,status,'');
+ // rid=addressInfo.Id;
resp.recordId = addressInfo.Id;
- resp.message = '';
+ // resp.message = 'success saveAddress';
resp.status = status;
+ PIHelper.saveTransLog(sobjectTypeValue, awsDataId, addressInfo.Id, transId, addressJson , status,'');
System.debug('resp from sfdx back-end' + resp);
return resp;
- } catch(Exception e) {
+ } catch(DmlException e) {
+ Integer index = 0;
+ System.debug(e.getNumDml());
+ System.debug(e.getDmlFields(index));
+ System.debug(e.getDmlId(index));
+ System.debug(e.getDmlIndex(index));
+ System.debug(e.getDmlMessage(index));
+ System.debug(e.getDmlStatusCode(index));
+ System.debug(e.getDmlType(index));
+ system.debug(e.getMessage());
+ system.debug(e.getStackTraceString());
+
System.debug('into catch'+e.getMessage());
Database.rollback(sp);
- status = 'fail';
- PIHelper.saveTransLog(sobjectTypeValue,(String)addressInfo.get('AWS_Data_Id__c'),rid,transId,addressJson,status,e.getMessage());
- resp.message = e.getMessage();
- resp.status = status;
+ resp.status = 'Exception';
+ resp.message ='淇濆瓨澶辫触锛屽師鍥�:'+ e.getDmlMessage(index);
+ PIHelper.saveTransLog(sobjectTypeValue, awsDataId, addressInfo.Id, transId, addressJson, status, e.getMessage()+e.getStackTraceString());
+ return resp;
+
+ }catch(Exception e) {
+ System.debug('into catch'+e.getMessage());
+ Database.rollback(sp);
+ // status = 'Exception';
+ // resp.status = status;
+ resp.status = 'Exception';
+ resp.message = e.getMessage()+e.getStackTraceString();
+ PIHelper.saveTransLog(sobjectTypeValue, awsDataId, addressInfo.Id, transId, addressJson, status, resp.message);
+ // PIHelper.saveTransLog(sobjectTypeValue,(String)addressInfo.get('AWS_Data_Id__c'),rid,transId,addressJson,status,e.getMessage());
return resp;
}
}
--
Gitblit v1.9.1