mirror of
https://github.com/oopuuu/zTC1.git
synced 2025-12-12 04:58:17 +08:00
/xxxx 删除定时任务
This commit is contained in:
@@ -91,6 +91,15 @@ void GetPraFromUrl(char* url, char* pra, char* val)
|
|||||||
|
|
||||||
static int HttpGetIndexPage(httpd_request_t *req)
|
static int HttpGetIndexPage(httpd_request_t *req)
|
||||||
{
|
{
|
||||||
|
char* buf = "1678369623 4 0";
|
||||||
|
pTimedTask task = (pTimedTask)malloc(sizeof(struct TimedTask));
|
||||||
|
sscanf(buf, "%ld %d %d", &task->prs_time, &task->socket_idx, &task->on);
|
||||||
|
AddTask(task);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
OSStatus err = kNoErr;
|
OSStatus err = kNoErr;
|
||||||
|
|
||||||
err = httpd_send_all_header(req, HTTP_RES_200, sizeof(web_index_html), HTTP_CONTENT_HTML_ZIP);
|
err = httpd_send_all_header(req, HTTP_RES_200, sizeof(web_index_html), HTTP_CONTENT_HTML_ZIP);
|
||||||
@@ -357,7 +366,7 @@ static int HttpDelTask(httpd_request_t *req)
|
|||||||
{
|
{
|
||||||
OSStatus err = kNoErr;
|
OSStatus err = kNoErr;
|
||||||
|
|
||||||
char* time_str = strstr(req->filename, "/task/");
|
char* time_str = strstr(req->filename, "/xxxx/");
|
||||||
if (!time_str)
|
if (!time_str)
|
||||||
{
|
{
|
||||||
http_log("HttpDelTask url[%s] err", req->filename);
|
http_log("HttpDelTask url[%s] err", req->filename);
|
||||||
@@ -365,13 +374,12 @@ static int HttpDelTask(httpd_request_t *req)
|
|||||||
}
|
}
|
||||||
http_log("HttpDelTask url[%s] time_str[%s][%s]", req->filename, time_str, time_str + 6);
|
http_log("HttpDelTask url[%s] time_str[%s][%s]", req->filename, time_str, time_str + 6);
|
||||||
|
|
||||||
//int time1;
|
int time1;
|
||||||
//sscanf(time_str + 6, "%d", &time1);
|
sscanf(time_str + 6, "%d", &time1);
|
||||||
|
|
||||||
//char* mess = DelTask(time1) ? "OK" : "NO";
|
char* mess = DelTask(time1) ? "OK" : "NO";
|
||||||
|
|
||||||
//OSStatus err = kNoErr;
|
send_http(mess, strlen(mess), exit, &err);
|
||||||
//send_http(mess, strlen(mess), exit, &err);
|
|
||||||
exit:
|
exit:
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
@@ -413,6 +421,7 @@ const struct httpd_wsgi_call g_app_handlers[] = {
|
|||||||
{ "/mqtt/config", HTTPD_HDR_DEFORT, 0, NULL, HttpSetMqttConfig, NULL, NULL },
|
{ "/mqtt/config", HTTPD_HDR_DEFORT, 0, NULL, HttpSetMqttConfig, NULL, NULL },
|
||||||
{ "/log", HTTPD_HDR_DEFORT, 0, HttpGetLog, NULL, NULL, NULL },
|
{ "/log", HTTPD_HDR_DEFORT, 0, HttpGetLog, NULL, NULL, NULL },
|
||||||
{ "/task", HTTPD_HDR_DEFORT, APP_HTTP_FLAGS_NO_EXACT_MATCH, HttpGetTasks, HttpAddTask, NULL, HttpDelTask },
|
{ "/task", HTTPD_HDR_DEFORT, APP_HTTP_FLAGS_NO_EXACT_MATCH, HttpGetTasks, HttpAddTask, NULL, HttpDelTask },
|
||||||
|
{ "/xxxx", HTTPD_HDR_DEFORT, APP_HTTP_FLAGS_NO_EXACT_MATCH, HttpDelTask, NULL, NULL, NULL },
|
||||||
{ "/ota", HTTPD_HDR_DEFORT, 0, Otastatus, OtaStart, NULL, NULL },
|
{ "/ota", HTTPD_HDR_DEFORT, 0, Otastatus, OtaStart, NULL, NULL },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -554,12 +554,13 @@ function GetTimedTask() {
|
|||||||
<td>" + tasks[i].prs_time + "</td>\
|
<td>" + tasks[i].prs_time + "</td>\
|
||||||
<td>" + tasks[i].socket_idx + "</td>\
|
<td>" + tasks[i].socket_idx + "</td>\
|
||||||
<td>" + tasks[i].on + "</td>\
|
<td>" + tasks[i].on + "</td>\
|
||||||
<td><a href='javasvript:DeleteTask(" + tasks[i].socket_idx + ");'>Delete</a></td>\
|
<td><a href='javascript:DelTimedTask(" + tasks[i].timestamp + ");'>Delete</a></td>\
|
||||||
</tr>";
|
</tr>";
|
||||||
}
|
}
|
||||||
document.getElementById("timed_task_tb").innerHTML = tb_html;
|
document.getElementById("timed_task_tb").innerHTML = tb_html;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
GetTimedTask();
|
||||||
|
|
||||||
function AddTimedTask() {
|
function AddTimedTask() {
|
||||||
var tim = document.getElementById("task_time").value;
|
var tim = document.getElementById("task_time").value;
|
||||||
@@ -584,12 +585,10 @@ function AddTimedTask() {
|
|||||||
}, cmd);
|
}, cmd);
|
||||||
}
|
}
|
||||||
|
|
||||||
function DelTimedTask() {
|
function DelTimedTask(timestamp) {
|
||||||
var time = "123456";
|
HttpGet("/xxxx/"+timestamp, function (re) {
|
||||||
HttpPost("/task?time="+time, function (re) {
|
|
||||||
SetOK(2);
|
|
||||||
GetTimedTask();
|
GetTimedTask();
|
||||||
}, time);
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function OtaStart() {
|
function OtaStart() {
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user