From 7e9badac4f3df3650e72bd419f9cdaa485b054d6 Mon Sep 17 00:00:00 2001
From: wangrong <wangrong@shsening.com>
Date: 星期五, 08 七月 2022 11:43:14 +0800
Subject: [PATCH] 提交schedule测试
---
src/app/modules/business/entity/periodicsetting.ts | 2 +-
src/schedule/taskSchedule.js | 24 ++++++++++++++++++------
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/app/modules/business/entity/periodicsetting.ts b/src/app/modules/business/entity/periodicsetting.ts
index a5b8c25..5eac4da 100644
--- a/src/app/modules/business/entity/periodicsetting.ts
+++ b/src/app/modules/business/entity/periodicsetting.ts
@@ -9,7 +9,7 @@
@Column({ comment: '鍛ㄦ湡浠诲姟', type: 'varchar', default: '', length: 255 })
crontab_rule: string;
- @Column({ comment: '浠诲姟寮�濮嬫椂闂�', type: 'datetime' })
+ @Column({ comment: '浠诲姟寮�濮嬫椂闂�', default: null, type: 'datetime' })
start_time: Date;
@Column({ comment: '浠诲姟缁撴潫鏃堕棿', type: 'datetime' })
diff --git a/src/schedule/taskSchedule.js b/src/schedule/taskSchedule.js
index 833fc11..4941f56 100644
--- a/src/schedule/taskSchedule.js
+++ b/src/schedule/taskSchedule.js
@@ -17,7 +17,7 @@
var periodTasklist = []
-var payload = { source: "AwesomeString", syscommand: 1, subcommand: 2, generatetime: "2", targetclient:"111",returnserver:"#server#", taskuuid:"1234" };
+var payload = { source: "AwesomeString", syscommand: 1, subcommand: 2, generatetime: "2", targetclient: "111", returnserver: "#server#", taskuuid: "1234" };
// Verify the payload if necessary (i.e. when possibly incomplete or invalid)
var errMsg = CommandMessage.verify(payload);
@@ -44,8 +44,20 @@
schedule.scheduleJob(rule_task, async () => {//姣忓垎閽熻鍙栧懆鏈熶换鍔� 骞跺皢浠诲姟鍒嗚В鎵ц
// let res = httpGet('http://127.0.0.1:8001/admin/business/periodicsetting/getdata?bid=getPeriodTaskList');
axios.get('http://127.0.0.1:8001/admin/business/periodicsetting/getdata?bid=getPeriodTaskList').then(response => {
- periodTasklist = response.data.data;
- console.log(periodTasklist)
+ response.data.data.every(taskinfo => {
+ console.log(taskinfo)
+
+ let subcommd = taskinfo.task_type < 3 ? taskinfo.task_type : 4;
+ periodTasklist.push({
+ source: "system",
+ syscommand: taskinfo.task_type,
+ subcommand: subcommd,
+ generatetime: "1",
+ targetclient: "111",
+ returnserver: "server0",
+ taskuuid: taskinfo.id
+ })
+ })
}).catch(error => {
console.log(error);
});
@@ -54,7 +66,7 @@
schedule.scheduleJob(rule, async () => {//姣忓垎閽熻鍙栧懆鏈熶换鍔� 骞跺皢浠诲姟鍒嗚В鎵ц
//http://192.168.1.4:5000/api
// Exemplary payload
- var payload = { source: "AwesomeString", syscommand: 1, subcommand: 2, generatetime: "2", targetclient:"111",returnserver:"#server#", taskuuid:"1234" };
+ var payload = { source: "AwesomeString", syscommand: 1, subcommand: 2, generatetime: "2", targetclient: "111", returnserver: "#server#", taskuuid: "1234" };
// Verify the payload if necessary (i.e. when possibly incomplete or invalid)
var errMsg = CommandMessage.verify(payload);
@@ -63,12 +75,12 @@
// Create a new message
var message = CommandMessage.create(payload); // or use .fromObject if conversion is necessary
-
+
// let buffer = Buffer.from(command_req)
let buffer = CommandMessage.encode(message).finish();
let msg = CommandMessage.decode(buffer);
console.log('-------step in-------------------------')
- let urlstr = "http://192.168.1.4:5000/api";
+ let urlstr = "http://192.168.0.209:5000/api";
axios({
method: 'post',
url: urlstr,
--
Gitblit v1.9.1