From d8dc84a3d56df839895f1c417a4d9cbee763d262 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期五, 03 三月 2023 14:50:59 +0800
Subject: [PATCH] gzw 测试环境代码更新
---
force-app/main/default/classes/LogAutoSendBatch.cls | 146 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 112 insertions(+), 34 deletions(-)
diff --git a/force-app/main/default/classes/LogAutoSendBatch.cls b/force-app/main/default/classes/LogAutoSendBatch.cls
index d51e626..2b270b0 100644
--- a/force-app/main/default/classes/LogAutoSendBatch.cls
+++ b/force-app/main/default/classes/LogAutoSendBatch.cls
@@ -3,12 +3,28 @@
private String typeNFM;
private String messageGroupNumber;
private Datetime times;
- private Boolean isForecast;// 20220318 ljh SWAG-CC54R2 add
+ private Boolean isForecast;// 20220318 ljh SWAG-CC54R2 add
+ private String loginId;
+
+ //20230203 lt 璁″垝鐨勪綔涓氫紭鍖� 涓�灏忔椂涓ゆ start
+ private BatchEmailUtil.ScBean scB1;
+ //20230203 lt 璁″垝鐨勪綔涓氫紭鍖� 涓�灏忔椂涓ゆ end
+
/**
* 銈炽兂銈广偪銉炽儓
*/
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;
@@ -28,16 +44,68 @@
public Integer max_cnt = Integer.valueOf(System.Label.batch_retry_max_cnt);
global Database.QueryLocator start(Database.BatchableContext BC) {
+ //20230203 lt 璁″垝鐨勪綔涓氫紭鍖� 涓�灏忔椂涓ゆ start
+ scB1 = BatchEmailUtil.setSc1('LogAutoSendSchedule', 0, 23, 0, '0 30 *', null);
+ if (System.Test.isRunningTest() == false) {
+ for(CronTrigger ct : [SELECT Id FROM CronTrigger WHERE CronJobDetail.Name =: scB1.scName]) {
+ System.abortJob(ct.Id);
+ }
+ system.schedule(scB1.scName, scB1.scTime, new LogAutoSendSchedule());
+ }
+ //20230203 lt 璁″垝鐨勪綔涓氫紭鍖� 涓�灏忔椂涓ゆ end
+
String profileId = UserInfo.getProfileId();
- //20191224 HWAG-BK65E8 add start
- if (String.isNotBlank(typeNFM) && String.isNotBlank(messageGroupNumber) && times != null) {
+ // 20220318 ljh SWAG-CC54R2 add start
+ if(String.isNotBlank(typeNFM) && typeNFM == 'NFM010' && String.isBlank(messageGroupNumber)){
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 CreatedDate >= : times AND MessageGroupNumber__c >= : messageGroupNumber
+ 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 ]
+ );
+ }
+ // 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) {
+ 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 != '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
@@ -48,37 +116,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))]
);
- // 20220318 ljh SWAG-CC54R2 add start
- } else if(String.isNotBlank(typeNFM) && typeNFM == 'NFM010'){
+ }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 OR (retry_cnt__c != null AND retry_cnt__c > 0 AND retry_cnt__c < : max_cnt))
- AND Type__c = : typeNFM ]
- );
- // 20220318 ljh SWAG-CC54R2 add end
- } 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
+ ]
);
}
}
@@ -171,6 +231,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);
@@ -256,38 +326,44 @@
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.execute(rowData, null);
- // }
+ if (strType_c == 'NFM112') {//鍏堟鍚庝慨pk
+ NFM112Controller.ManualExecute(rowData.id);
+ }
+ if (strType_c == 'NFM113') {//鍏堟鍚庝慨pk
+ 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.executefuture(rowData.Id);
+ NFM705Rest.main(rowData.Id);
}
if (strType_c == 'NFM706') {
- NFM706Rest.executefuture(rowData.Id);
+ NFM706Rest.main(rowData.Id);
}
if (strType_c == 'NFM707') {
- NFM707Rest.executefuture(rowData.Id);
+ NFM707Rest.main(rowData.Id);
}
-
-
}
if (System.Test.isRunningTest()) {
Integer i = 0;
@@ -458,6 +534,8 @@
}
global void finish(Database.BatchableContext BC) {
+ BatchEmailUtil.removeOtherSc('LogAutoSendSchedule', scB1.scName); //20230203 lt 璁″垝鐨勪綔涓氫紭鍖�
+
// 浠婂洖銇倓銈嬨亾銇ㄣ仾銇勩仹銇�
// 20220318 ljh SWAG-CC54R2 add start
if(String.isNotBlank(typeNFM) && typeNFM == 'NFM010' && isForecast){
--
Gitblit v1.9.1