|
@@ -56,7 +56,7 @@ CSATExecutor::~CSATExecutor(void)
|
|
|
bool CSATExecutor::IsTaskExist(SATHTTP::STTask &task)
|
|
|
{
|
|
|
// 若是冒烟任务;
|
|
|
-#if defined _DEBUG || defined RTEST
|
|
|
+#ifdef _DBG_SOMKING_
|
|
|
task.taskInfo.strInstanceType = "4";
|
|
|
#endif
|
|
|
if ( task.taskInfo.strInstanceType == "4" ) {
|
|
@@ -1250,7 +1250,7 @@ int CSATExecutor::AttachTaskInfo2Buffer(SATPROTO::TaskInfo (&pbuff)[SATPROTO::MA
|
|
|
|
|
|
bool CSATExecutor::SmokeTaskPretreated(SATHTTP::STTask &task)
|
|
|
{
|
|
|
-#if defined _DEBUG || defined RTEST
|
|
|
+#ifdef _DBG_SOMKING_
|
|
|
task.taskInfo.stSomkingCycle.nType = 1;
|
|
|
task.taskInfo.stSomkingCycle.nWeek = 0;
|
|
|
task.taskInfo.stSomkingCycle.nDay = 0;
|
|
@@ -1272,16 +1272,16 @@ bool CSATExecutor::SmokeTaskPretreated(SATHTTP::STTask &task)
|
|
|
bTimeIsUp = true;
|
|
|
}
|
|
|
else if ( task.taskInfo.stSomkingCycle.nType == 1 ) {// 每天;
|
|
|
- if ( gmtm.tm_hour == hour && gmtm.tm_min >= minute && gmtm.tm_min <= minute + 2)
|
|
|
+ if ( gmtm.tm_hour == hour && gmtm.tm_min >= minute && gmtm.tm_min <= minute + 3)
|
|
|
bTimeIsUp = true;
|
|
|
}
|
|
|
else if ( task.taskInfo.stSomkingCycle.nType == 2 ) {// 每周;
|
|
|
- if ( gmtm.tm_wday == task.taskInfo.stSomkingCycle.nWeek && gmtm.tm_hour == hour && gmtm.tm_min >= minute && gmtm.tm_min <= minute + 2)
|
|
|
+ if ( gmtm.tm_wday == task.taskInfo.stSomkingCycle.nWeek && gmtm.tm_hour == hour && gmtm.tm_min >= minute && gmtm.tm_min <= minute + 3)
|
|
|
bTimeIsUp = true;
|
|
|
}
|
|
|
else if ( task.taskInfo.stSomkingCycle.nType == 3 ) {// 每月;
|
|
|
if ( gmtm.tm_mday == task.taskInfo.stSomkingCycle.nDay &&
|
|
|
- gmtm.tm_wday == task.taskInfo.stSomkingCycle.nWeek && gmtm.tm_hour == hour && gmtm.tm_min >= minute && gmtm.tm_min <= minute + 2)
|
|
|
+ gmtm.tm_wday == task.taskInfo.stSomkingCycle.nWeek && gmtm.tm_hour == hour && gmtm.tm_min >= minute && gmtm.tm_min <= minute + 3)
|
|
|
bTimeIsUp = true;
|
|
|
}
|
|
|
|