From e3c02c03dd2de442bbced87236f60a13a1cd154e Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期四, 02 三月 2023 17:51:57 +0800
Subject: [PATCH] gzw 正式环境最新代码更新
---
force-app/main/default/classes/LogAutoSendBatch.cls | 101 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 80 insertions(+), 21 deletions(-)
diff --git a/force-app/main/default/classes/LogAutoSendBatch.cls b/force-app/main/default/classes/LogAutoSendBatch.cls
index 40bdedb..edbc062 100644
--- a/force-app/main/default/classes/LogAutoSendBatch.cls
+++ b/force-app/main/default/classes/LogAutoSendBatch.cls
@@ -4,11 +4,22 @@
private String messageGroupNumber;
private Datetime times;
private Boolean isForecast;// 20220318 ljh SWAG-CC54R2 add
+ private String loginId;
/**
* 銈炽兂銈广偪銉炽儓
*/
global LogAutoSendBatch() {
}
+ global LogAutoSendBatch(String loginId) {
+ this.loginId = loginId;
+ }
+ // 2023-1-19 zyh DB202301301244 add start
+ global LogAutoSendBatch(String type,String message) {
+ this.typeNFM = type;
+ this.messageGroupNumber = message;
+ System.debug('type++++++'+type + 'message+++++' + message);
+ }
+ // 2023-1-19 zyh DB202301301244 add end
// 20220318 ljh SWAG-CC54R2 add start
global LogAutoSendBatch(String type,Boolean isForecast) {
this.typeNFM = type;
@@ -40,7 +51,35 @@
AND (retry_cnt__c = null OR (retry_cnt__c != null AND retry_cnt__c > 0 AND retry_cnt__c < : max_cnt))
AND Type__c = : typeNFM ]
);
- } else if (String.isNotBlank(typeNFM) && String.isNotBlank(messageGroupNumber) && times != null) {
+ }
+ // gzw 603 閲嶅彂鍒ゆ柇 鏆傛椂鐢�
+ // ljh鍙墽琛岃嚜宸辫繖鏉℃棩蹇楋紝鑰屼笖杩欎釜鏃ュ織retry_cnt__c涓嶆槸0
+ else if (String.isNotBlank(loginId)) {
+ return Database.getQueryLocator(
+ [SELECT Id, Name, Log__c, ErrorLog__c, Log2__c, Log3__c, Log4__c, Log5__c, Log6__c,
+ Log7__c, Log8__c, Log9__c, Log10__c, Log11__c, Log12__c, MessageGroupNumber__c, Type__c,
+ retry_cnt__c, NFM501Future_Count__c, NFM501_Web_Annex_Count__c
+ FROM BatchIF_Log__c
+ WHERE RowDataFlg__c = true
+ AND retry_cnt__c != 0
+ AND id = : loginId ]
+ );
+ }
+ // gzw 603 閲嶅彂鍒ゆ柇 鏆傛椂鐢�
+ // 2023-01-19 zyh add start
+ else if (String.isNotBlank(typeNFM) && String.isNotBlank(messageGroupNumber) && times == null) {
+ return Database.getQueryLocator(
+ [SELECT Id, Name, Log__c, ErrorLog__c, Log2__c, Log3__c, Log4__c, Log5__c, Log6__c,
+ Log7__c, Log8__c, Log9__c, Log10__c, Log11__c, Log12__c, MessageGroupNumber__c, Type__c,
+ retry_cnt__c, NFM501Future_Count__c, NFM501_Web_Annex_Count__c
+ FROM BatchIF_Log__c
+ WHERE RowDataFlg__c = true
+ AND Type__c = : typeNFM AND MessageGroupNumber__c = : messageGroupNumber
+ ]
+ );
+ }
+ // 2023-01-19 zyh add end
+ else if (String.isNotBlank(typeNFM) && String.isNotBlank(messageGroupNumber) && times != null) {
// 20220318 ljh SWAG-CC54R2 add end
//20191224 HWAG-BK65E8 add start
// if (String.isNotBlank(typeNFM) && String.isNotBlank(messageGroupNumber) && times != null) {
@@ -50,7 +89,8 @@
retry_cnt__c, NFM501Future_Count__c, NFM501_Web_Annex_Count__c
FROM BatchIF_Log__c
WHERE RowDataFlg__c = true
- AND Type__c = : typeNFM AND CreatedDate >= : times AND MessageGroupNumber__c >= : messageGroupNumber
+ AND Type__c != 'NFM007' // 2023-01-18 ZYH ADD
+ AND Type__c = : typeNFM AND CreatedDate >= : times AND MessageGroupNumber__c >= : messageGroupNumber
order by MessageGroupNumber__c asc ]
);
//20191224 HWAG-BK65E8 add end
@@ -61,25 +101,29 @@
retry_cnt__c, NFM501Future_Count__c, NFM501_Web_Annex_Count__c
FROM BatchIF_Log__c
WHERE RowDataFlg__c = true
- AND ((retry_cnt__c != null AND retry_cnt__c > 0 AND retry_cnt__c < : max_cnt)
+ AND Type__c != 'NFM007' // 2023-01-18 ZYH ADD
+ AND ((retry_cnt__c != null AND retry_cnt__c > 0 AND retry_cnt__c < : max_cnt)
OR (NFM501Future_Count__c != null
AND NFM501Future_Count__c > 0 AND NFM501Future_Count__c < : max_cnt)
OR(NFM501_Web_Annex_Count__c != null
AND NFM501_Web_Annex_Count__c > 0 AND NFM501_Web_Annex_Count__c < : max_cnt))]
);
- } else {
+ }else {
return Database.getQueryLocator(
[SELECT Id, Name, Log__c, ErrorLog__c, Log2__c, Log3__c, Log4__c, Log5__c, Log6__c,
Log7__c, Log8__c, Log9__c, Log10__c, Log11__c, Log12__c, MessageGroupNumber__c, Type__c,
retry_cnt__c, NFM501Future_Count__c, NFM501_Web_Annex_Count__c
FROM BatchIF_Log__c
WHERE RowDataFlg__c = true
- AND ((retry_cnt__c != null AND retry_cnt__c > 0 AND retry_cnt__c < : max_cnt)
+ AND Type__c != 'NFM007' // 2023-01-18 ZYH ADD
+ AND ((retry_cnt__c != null AND retry_cnt__c > 0 AND retry_cnt__c < : max_cnt)
OR (NFM501Future_Count__c != null
AND NFM501Future_Count__c > 0 AND NFM501Future_Count__c < : max_cnt)
OR(NFM501_Web_Annex_Count__c != null
AND NFM501_Web_Annex_Count__c > 0 AND NFM501_Web_Annex_Count__c < : max_cnt))
- AND ownerId = : UserInfo.getUserId()]
+ AND ownerId = : UserInfo.getUserId()
+ ORDER BY CreatedDate // 2023-02-04 ZYH ADD
+ ]
);
}
}
@@ -172,6 +216,16 @@
NFM114Rest.main(rowData.Id);
}
// 2021/12/1 fxk add End
+ // // 鐢靛瓙绛炬敹鍗曞彂閫丼AP鎺ュ彛 thh 20220427 start
+ if (strType_c == 'NFM116') {
+ NFM116Controller.execute(rowData,null);
+ }
+ // // 鐢靛瓙绛炬敹鍗曞彂閫丼AP鎺ュ彛 thh 20220427 end
+ // XLIU-CEW9PD 闆朵欢棰勮榻愬鏃ユ湡 -SFDC澧炲姞 LY 20220610 start
+ if (strType_c == 'NFM117') {
+ NFM117Rest.main(rowData.Id);
+ }
+ // XLIU-CEW9PD 闆朵欢棰勮榻愬鏃ユ湡 -SFDC澧炲姞 LY 20220610 end
// 涓夋柟鎺ュ彛
if (strType_c == 'NFM201') {
NFM201Controller.execute(rowData, null);
@@ -221,7 +275,7 @@
if (strType_c == 'NFM601') {
NFM601Controller.ManualExecute(rowData.Id);
}
- /*if (strType_c == 'NFM602') {
+ if (strType_c == 'NFM602') {
NFM602Controller.ManualExecute(rowData.Id);
}
if (strType_c == 'NFM606') {
@@ -248,39 +302,44 @@
if (strType_c == 'NFM612') {
NFM612Rest.main(rowData.Id);
}
- // if (strType_c == 'NFM620') {
- // NFM620Rest.main(rowData.Id);
- // }
- // if (strType_c == 'NFM623') {
- // NFM623Rest.main(rowData.Id);
- // }
+ if (strType_c == 'NFM620') {
+ NFM620Rest.main(rowData.Id);
+ }
+ if (strType_c == 'NFM623') {
+ NFM623Rest.main(rowData.Id);
+ }
if (strType_c == 'NFM621') {
NFM621Controller.execute(rowData, null);
}
+ //zhj 鏂版柟妗堟敼閫� 2023-01-06 start
// if (strType_c == 'NFM624') {//鏅烘収鍖荤枟pk
// NFM624Rest.main(rowData.Id);
// }
+ if (strType_c == 'NFM624Rest2') {//鏅烘収鍖荤枟pk
+ NFMUtil.againSendToAWS624(rowData.Id);
+ }
+ //zhj 鏂版柟妗堟敼閫� 2023-01-06 end
if (strType_c == 'NFM622') {
NFM622Controller.execute(rowData, null);
}
if (strType_c == 'NFM112') {//鍏堟鍚庝慨pk
- NFM112Controller.callout(rowData.id,null);
+ NFM112Controller.ManualExecute(rowData.id);
}
if (strType_c == 'NFM113') {//鍏堟鍚庝慨pk
- NFM113Rest.executefuture(rowData.id);
+ NFM113Rest.main(rowData.id);
}
if (strType_c == 'NFM701') {
NFM701Controller.execute(rowData, null);
}
- // if (strType_c == 'NFM702') {
- // NFM702Controller.execute(rowData, null);
- // }
+ if (strType_c == 'NFM702') {
+ NFM702Controller.execute(rowData, null);
+ }
if (strType_c == 'NFM703') {
NFM703Controller.execute(rowData, null);
}
- // if (strType_c == 'NFM704') {
- // NFM704Rest.executefuture(rowData.Id);
- // }
+ if (strType_c == 'NFM704') {
+ NFM704Rest.main(rowData.Id);
+ }
if (strType_c == 'NFM705') {
NFM705Rest.main(rowData.Id);
}
--
Gitblit v1.9.1