From c0515c2f47cafe8da39089d2173e7b41f56e5f3e Mon Sep 17 00:00:00 2001
From: LiJinHuan <lijinhuan@prec-tech.com>
Date: 星期二, 22 三月 2022 11:04:38 +0800
Subject: [PATCH] 【委托】 【优先紧急对应】I/F010&I/F110传输检查修复和预测修复
---
force-app/main/default/classes/LogAutoSendBatch.cls | 259 +++++++++++++++++++++++++++++++++++++++++----------
force-app/main/default/classes/BeforeSSOpportunitySchedule.cls | 5
2 files changed, 212 insertions(+), 52 deletions(-)
diff --git a/force-app/main/default/classes/BeforeSSOpportunitySchedule.cls b/force-app/main/default/classes/BeforeSSOpportunitySchedule.cls
index 552533e..e3d6dc8 100644
--- a/force-app/main/default/classes/BeforeSSOpportunitySchedule.cls
+++ b/force-app/main/default/classes/BeforeSSOpportunitySchedule.cls
@@ -22,7 +22,10 @@
String todayStr = Datetime.now().format('yyyy/MM/dd');
// if (todayStr == '2021/10/07') {
if (todayStr.endsWith('01')) {
- Id execBTId = Database.executeBatch(new BeforeSSOpportunityBatch(), 100);
+ // 20220318 ljh SWAG-CC54R2 update start
+ // Id execBTId = Database.executeBatch(new BeforeSSOpportunityBatch(), 100);
+ Id execBTId = Database.executeBatch(new LogAutoSendBatch('NFM010',true), 1);
+ // 20220318 ljh SWAG-CC54R2 update end
}
//姣忔湀1鍙疯繍琛� SWAG-C7ZC4L rentx end
diff --git a/force-app/main/default/classes/LogAutoSendBatch.cls b/force-app/main/default/classes/LogAutoSendBatch.cls
index 56c42c7..1491c30 100644
--- a/force-app/main/default/classes/LogAutoSendBatch.cls
+++ b/force-app/main/default/classes/LogAutoSendBatch.cls
@@ -1,13 +1,20 @@
-global class LogAutoSendBatch implements Database.Batchable<sObject> , Database.AllowsCallouts, Database.Stateful {
+global class LogAutoSendBatch implements Database.Batchable<sObject>, Database.AllowsCallouts, Database.Stateful {
private String typeNFM;
- private String messageGroupNumber;
+ private String messageGroupNumber;
private Datetime times;
+ private Boolean isForecast;// 20220318 ljh SWAG-CC54R2 add
/**
* 銈炽兂銈广偪銉炽儓
*/
- global LogAutoSendBatch() {}
-
+ global LogAutoSendBatch() {
+ }
+ // 20220318 ljh SWAG-CC54R2 add start
+ global LogAutoSendBatch(String type,Boolean isForecast) {
+ this.typeNFM = type;
+ this.isForecast = isForecast;
+ }
+ // 20220318 ljh SWAG-CC54R2 add end
//20191224 HWAG-BK65E8 add start
global LogAutoSendBatch(String type, String message, Datetime times) {
this.typeNFM = type;
@@ -22,45 +29,58 @@
global Database.QueryLocator start(Database.BatchableContext BC) {
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
- order by MessageGroupNumber__c asc ]
- );
+ [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 ]
+ );
+ } 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 = : typeNFM AND CreatedDate >= : times AND MessageGroupNumber__c >= : messageGroupNumber
+ order by MessageGroupNumber__c asc ]
+ );
//20191224 HWAG-BK65E8 add end
} else if (profileId.left(15).equals('00e10000000dzzG') || profileId.left(15).equals('00e10000000Y3o5')) {
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)
- 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))]
- );
+ [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)
+ 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 {
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)
- 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()]
- );
+ [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)
+ 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()]
+ );
}
}
@@ -144,6 +164,14 @@
if (strType_c == 'NFM110') {
NFM110Rest.main(rowData.Id);
}
+ // 2021/12/1 fxk add Star
+ if (strType_c == 'NFM115') {
+ NFM115Controller.execute(rowData,null);
+ }
+ if (strType_c == 'NFM114') {
+ NFM114Rest.main(rowData.Id);
+ }
+ // 2021/12/1 fxk add End
// 涓夋柟鎺ュ彛
if (strType_c == 'NFM201') {
NFM201Controller.execute(rowData, null);
@@ -178,11 +206,11 @@
if (strType_c == 'NFM401') {
NFM401Controller.executeAuto(rowData);
}
- // add tcm 20211207 start
- if (strType_c == 'NFM403') {
- NFM403Rest.main(rowData.Id);
- }
- // add tcm 20211207 end
+ // add tcm 20211207 start
+ if (strType_c == 'NFM403') {
+ NFM403Rest.main(rowData.Id);
+ }
+ // add tcm 20211207 end
if (strType_c == 'NFM501' && NFM501Future_Count > 0 && NFM501Future_Count < max_cnt) {
System.enqueueJob(new NFM501FutureController(rowData.id));
}
@@ -191,18 +219,142 @@
}
if (strType_c == 'NFM601') {
- NFM601Controller.ManualExecute(rowData.Id);
- }
-
- if (strType_c == 'NFM621') {
- NFM621Controller.execute(rowData, null);
- }
- if (strType_c == 'NFM622') {
- NFM622Controller.execute(rowData, null);
- }
+ NFM601Controller.ManualExecute(rowData.Id);
+ }
+ /*if (strType_c == 'NFM602') {
+ NFM602Controller.ManualExecute(rowData.Id);
+ }
+ if (strType_c == 'NFM606') {
+ NFM606Controller.ManualExecute(rowData.Id);
+ }
+ if (strType_c == 'NFM603') {
+ NFM603Controller.ManualExecute(rowData.Id);
+ }
+ if (strType_c == 'NFM605') {
+ NFM605Controller.ManualExecute(rowData.Id);
+ }
+ if (strType_c == 'NFM607') {
+ NFM607Rest.main(rowData.Id);
+ }
+ if (strType_c == 'NFM608') {
+ NFM608Rest.main(rowData.Id);
+ }
+ if (strType_c == 'NFM609') {
+ NFM609Rest.main(rowData.Id);
+ }
+ if (strType_c == 'NFM611') {
+ NFM611Rest.main(rowData.Id);
+ }
+ 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 == 'NFM621') {
+ NFM621Controller.execute(rowData, null);
+ }
+ // if (strType_c == 'NFM624') {//鏅烘収鍖荤枟pk
+ // NFM624Rest.main(rowData.Id);
+ // }
+ if (strType_c == 'NFM622') {
+ NFM622Controller.execute(rowData, null);
+ }
+ // if (strType_c == 'NFM112') {//鍏堟鍚庝慨pk
+ // NFM112Controller.execute(rowData, null);
+ // }
+ if (strType_c == 'NFM701') {
+ NFM701Controller.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 == 'NFM705') {
+ NFM705Rest.main(rowData.Id);
+ }
+ if (strType_c == 'NFM706') {
+ NFM706Rest.main(rowData.Id);
+ }
+ if (strType_c == 'NFM707') {
+ NFM707Rest.main(rowData.Id);
+ }
}
if (System.Test.isRunningTest()) {
Integer i = 0;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
i++;
i++;
i++;
@@ -306,5 +458,10 @@
global void finish(Database.BatchableContext BC) {
// 浠婂洖銇倓銈嬨亾銇ㄣ仾銇勩仹銇�
+ // 20220318 ljh SWAG-CC54R2 add start
+ if(String.isNotBlank(typeNFM) && typeNFM == 'NFM010' && isForecast){
+ Id execBTId = Database.executeBatch(new BeforeSSOpportunityBatch(), 100);
+ }
+ // 20220318 ljh SWAG-CC54R2 add end
}
}
\ No newline at end of file
--
Gitblit v1.9.1