From e5ee9138c720e48f7447be486f247e765b3f1e46 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 18 八月 2023 11:20:02 +0800
Subject: [PATCH] 增加参数下发接口
---
service/task.go | 4
logs/apsClient.info.log | 79 +++++++++++++++
model/order.go | 10 +-
model/procedures.go | 10 +-
router/index.go | 7
docs/swagger.yaml | 22 ++++
logs/apsClient.err.log | 7 +
docs/docs.go | 32 ++++++
api/v1/task.go | 58 +++++++++++
docs/swagger.json | 32 ++++++
10 files changed, 238 insertions(+), 23 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index cc746f2..2e01370 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -8,7 +8,9 @@
"apsClient/pkg/ecode"
"apsClient/pkg/logx"
"apsClient/service"
+ "fmt"
"github.com/gin-gonic/gin"
+ "time"
)
type TaskApi struct{}
@@ -34,7 +36,7 @@
}
// TaskStart
-// @Tags Base
+// @Tags Task
// @Summary 浠诲姟寮�濮�
// @Produce application/json
// @Param id path int true "宸ュ簭id"
@@ -82,7 +84,7 @@
}
// TaskFinish
-// @Tags Base
+// @Tags Task
// @Summary 浠诲姟缁撴潫
// @Produce application/json
// @Param id path int true "宸ュ簭id"
@@ -112,3 +114,55 @@
}
ctx.Ok()
}
+
+// SendProcessParams
+// @Tags Task
+// @Summary 涓嬪彂宸ヨ壓鍙傛暟
+// @Produce application/json
+// @Param id path int true "宸ュ簭id"
+// @Success 200 {object} contextx.Response{service.GetProcessModel} "鎴愬姛"
+// @Router /v1/task/sendProcessParams/{id} [post]
+func (slf *TaskApi) SendProcessParams(c *gin.Context) {
+ ctx, ok := contextx.NewContext(c, nil)
+ if !ok {
+ return
+ }
+ idx := c.Param("id")
+ if idx == "" {
+ ctx.Fail(ecode.ParamsErr)
+ return
+ }
+ id := convertx.Atoi(idx)
+ procedure, code := service.NewTaskService().GetProcedureById(id)
+ if code != ecode.OK {
+ ctx.Fail(code)
+ return
+ }
+ order, err := service.NewTaskService().GetOrderByOrderId(procedure.OrderID)
+ if err != nil {
+ ctx.Fail(ecode.UnknownErr)
+ return
+ }
+
+ params := service.GetProcessModelParams{
+ WorkOrder: "",
+ OrderId: procedure.OrderID,
+ Product: order.ProductName,
+ Procedure: procedure.ProceduresInfo.ProcedureName,
+ Device: procedure.ProceduresInfo.DeviceID,
+ }
+
+ resp, err := service.ProcessModel{}.GetProcessModel(params)
+ if err != nil {
+ logx.Errorf("SendProcessModel GetProcessModel err: %v", err.Error())
+ ctx.Fail(ecode.UnknownErr)
+ return
+ }
+ fmt.Println("----------------寮�濮嬩笅鍙戝伐鑹哄弬鏁�-----------------")
+ for k, v := range resp.ParamsMap {
+ fmt.Println(fmt.Sprintf("%v : %v", k, v))
+ time.Sleep(time.Millisecond * 300)
+ }
+ fmt.Println("----------------涓嬪彂宸ヨ壓鍙傛暟瀹屾瘯-----------------")
+ ctx.Ok()
+}
diff --git a/docs/docs.go b/docs/docs.go
index 91eb01b..825f266 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -22,7 +22,7 @@
"application/json"
],
"tags": [
- "Base"
+ "Task"
],
"summary": "浠诲姟缁撴潫",
"parameters": [
@@ -75,13 +75,41 @@
}
}
},
+ "/v1/task/sendProcessParams/{id}": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Task"
+ ],
+ "summary": "涓嬪彂宸ヨ壓鍙傛暟",
+ "parameters": [
+ {
+ "type": "integer",
+ "description": "宸ュ簭id",
+ "name": "id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
"/v1/task/start/{id}": {
"get": {
"produces": [
"application/json"
],
"tags": [
- "Base"
+ "Task"
],
"summary": "浠诲姟寮�濮�",
"parameters": [
diff --git a/docs/swagger.json b/docs/swagger.json
index 0fa3a0e..8b082c8 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -10,7 +10,7 @@
"application/json"
],
"tags": [
- "Base"
+ "Task"
],
"summary": "浠诲姟缁撴潫",
"parameters": [
@@ -63,13 +63,41 @@
}
}
},
+ "/v1/task/sendProcessParams/{id}": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Task"
+ ],
+ "summary": "涓嬪彂宸ヨ壓鍙傛暟",
+ "parameters": [
+ {
+ "type": "integer",
+ "description": "宸ュ簭id",
+ "name": "id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
"/v1/task/start/{id}": {
"get": {
"produces": [
"application/json"
],
"tags": [
- "Base"
+ "Task"
],
"summary": "浠诲姟寮�濮�",
"parameters": [
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index fa6eed7..8624ed1 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -119,7 +119,7 @@
$ref: '#/definitions/contextx.Response'
summary: 浠诲姟缁撴潫
tags:
- - Base
+ - Task
/v1/task/get:
get:
produces:
@@ -135,6 +135,24 @@
$ref: '#/definitions/response.TaskData'
type: object
summary: 鑾峰彇浠诲姟
+ tags:
+ - Task
+ /v1/task/sendProcessParams/{id}:
+ post:
+ parameters:
+ - description: 宸ュ簭id
+ in: path
+ name: id
+ required: true
+ type: integer
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/contextx.Response'
+ summary: 涓嬪彂宸ヨ壓鍙傛暟
tags:
- Task
/v1/task/start/{id}:
@@ -154,5 +172,5 @@
$ref: '#/definitions/contextx.Response'
summary: 浠诲姟寮�濮�
tags:
- - Base
+ - Task
swagger: "2.0"
diff --git a/logs/apsClient.err.log b/logs/apsClient.err.log
index 9f6ddbd..2e890e6 100644
--- a/logs/apsClient.err.log
+++ b/logs/apsClient.err.log
@@ -62,3 +62,10 @@
[2023-08-17 17:01:05] [error] [apsClient/model.Init:10] failed to initialize database, got error Binary was compiled with 'CGO_ENABLED=0', go-sqlite3 requires cgo to work. This is a stub
[2023-08-17 17:01:05] [error] [main.main:23] model Init err:Binary was compiled with 'CGO_ENABLED=0', go-sqlite3 requires cgo to work. This is a stub
[2023-08-17 17:27:57] [error] [apsClient/model.(*OrderSearch).First:189] trace {"error": "record not found", "elapsed": 0, "rows": 0, "sql": "SELECT * FROM `Order` WHERE status = \"1\" AND start_time >= 1692264477 AND `Order`.`deleted_at` IS NULL ORDER BY created_at asc,`Order`.`id` LIMIT 1"}
+[2023-08-17 17:29:01] [error] [apsClient/model.(*ProceduresSearch).First:197] trace {"error": "record not found", "elapsed": 0, "rows": 0, "sql": "SELECT * FROM `procedures` WHERE `procedures`.`deleted_at` IS NULL ORDER BY `procedures`.`id` LIMIT 1"}
+[2023-08-18 11:10:56] [error] [apsClient/model.Init:10] failed to initialize database, got error Binary was compiled with 'CGO_ENABLED=0', go-sqlite3 requires cgo to work. This is a stub
+[2023-08-18 11:10:56] [error] [main.main:23] model Init err:Binary was compiled with 'CGO_ENABLED=0', go-sqlite3 requires cgo to work. This is a stub
+[2023-08-18 11:12:50] [error] [apsClient/model.Init:10] failed to initialize database, got error Binary was compiled with 'CGO_ENABLED=0', go-sqlite3 requires cgo to work. This is a stub
+[2023-08-18 11:12:50] [error] [main.main:23] model Init err:Binary was compiled with 'CGO_ENABLED=0', go-sqlite3 requires cgo to work. This is a stub
+[2023-08-18 11:13:42] [error] [apsClient/model.(*ProceduresSearch).First:197] trace {"error": "record not found", "elapsed": 0, "rows": 0, "sql": "SELECT * FROM `procedures` WHERE `procedures`.`deleted_at` IS NULL ORDER BY `procedures`.`id` LIMIT 1"}
+[2023-08-18 11:14:18] [error] [apsClient/model.(*ProceduresSearch).First:197] trace {"error": "record not found", "elapsed": 0, "rows": 0, "sql": "SELECT * FROM `procedures` WHERE `procedures`.`deleted_at` IS NULL ORDER BY `procedures`.`id` LIMIT 1"}
diff --git a/logs/apsClient.info.log b/logs/apsClient.info.log
index 85d9e6a..c67594c 100644
--- a/logs/apsClient.info.log
+++ b/logs/apsClient.info.log
@@ -321,3 +321,82 @@
[2023-08-17 17:27:45] [info] [apsClient/nsq.Consume:17] Consume NewNsqConsumer topic:aps.wangpengfei.scheduleTask
[2023-08-17 17:27:57] [info] [apsClient/pkg/contextx.NewContext.func1:44] 192.168.20.120 | GET /v1/task/get | uid: | <nil>
[2023-08-17 17:28:54] [info] [main.shutdown:48] apsClient exited...
+[2023-08-17 17:29:00] [debug] [gorm.io/driver/sqlite.Migrator.HasTable.func1:33] trace {"elapsed": 0.0010009, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type='table' AND name=\"Order\""}
+[2023-08-17 17:29:00] [debug] [gorm.io/gorm/migrator.Migrator.RunWithValue:71] trace {"elapsed": 0.0010019, "rows": 3, "sql": "SELECT sql FROM sqlite_master WHERE type IN (\"table\",\"index\") AND tbl_name = \"Order\" AND sql IS NOT NULL order by type = \"table\" desc"}
+[2023-08-17 17:29:00] [debug] [gorm.io/driver/sqlite.Migrator.ColumnTypes.func1:119] trace {"elapsed": 0.0010051, "rows": -1, "sql": "SELECT * FROM `Order` LIMIT 1"}
+[2023-08-17 17:29:00] [debug] [gorm.io/driver/sqlite.Migrator.HasIndex.func1:313] trace {"elapsed": 0, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type = \"index\" AND tbl_name = \"Order\" AND name = \"idx_Order_deleted_at\""}
+[2023-08-17 17:29:00] [debug] [gorm.io/driver/sqlite.Migrator.HasIndex.func1:313] trace {"elapsed": 0, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type = \"index\" AND tbl_name = \"Order\" AND name = \"idx_Order_order_id\""}
+[2023-08-17 17:29:00] [debug] [gorm.io/driver/sqlite.Migrator.HasTable.func1:33] trace {"elapsed": 0, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type='table' AND name=\"procedures\""}
+[2023-08-17 17:29:00] [debug] [gorm.io/gorm/migrator.Migrator.RunWithValue:71] trace {"elapsed": 0, "rows": 3, "sql": "SELECT sql FROM sqlite_master WHERE type IN (\"table\",\"index\") AND tbl_name = \"procedures\" AND sql IS NOT NULL order by type = \"table\" desc"}
+[2023-08-17 17:29:00] [debug] [gorm.io/driver/sqlite.Migrator.ColumnTypes.func1:119] trace {"elapsed": 0, "rows": -1, "sql": "SELECT * FROM `procedures` LIMIT 1"}
+[2023-08-17 17:29:00] [debug] [gorm.io/driver/sqlite.Migrator.HasIndex.func1:313] trace {"elapsed": 0, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type = \"index\" AND tbl_name = \"procedures\" AND name = \"idx_procedures_deleted_at\""}
+[2023-08-17 17:29:00] [debug] [gorm.io/driver/sqlite.Migrator.HasIndex.func1:313] trace {"elapsed": 0, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type = \"index\" AND tbl_name = \"procedures\" AND name = \"idx_procedures_order_id\""}
+[2023-08-17 17:29:00] [info] [main.main:33] apsClient start serve...
+[2023-08-17 17:29:00] [info] [apsClient/nsq.Consume:17] Consume NewNsqConsumer topic:aps.wangpengfei.scheduleTask
+[2023-08-17 17:29:01] [info] [apsClient/pkg/contextx.NewContext.func1:44] 192.168.20.120 | GET /v1/task/start/1 | uid: | <nil>
+[2023-08-18 11:10:53] [info] [main.shutdown:48] apsClient exited...
+[2023-08-18 11:13:28] [debug] [gorm.io/driver/sqlite.Migrator.HasTable.func1:33] trace {"elapsed": 0, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type='table' AND name=\"Order\""}
+[2023-08-18 11:13:28] [debug] [gorm.io/gorm/migrator.Migrator.RunWithValue:71] trace {"elapsed": 0, "rows": 3, "sql": "SELECT sql FROM sqlite_master WHERE type IN (\"table\",\"index\") AND tbl_name = \"Order\" AND sql IS NOT NULL order by type = \"table\" desc"}
+[2023-08-18 11:13:28] [debug] [gorm.io/driver/sqlite.Migrator.ColumnTypes.func1:119] trace {"elapsed": 0, "rows": -1, "sql": "SELECT * FROM `Order` LIMIT 1"}
+[2023-08-18 11:13:28] [debug] [gorm.io/driver/sqlite.Migrator.HasIndex.func1:313] trace {"elapsed": 0, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type = \"index\" AND tbl_name = \"Order\" AND name = \"idx_Order_order_id\""}
+[2023-08-18 11:13:28] [debug] [gorm.io/driver/sqlite.Migrator.HasIndex.func1:313] trace {"elapsed": 0.0010015, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type = \"index\" AND tbl_name = \"Order\" AND name = \"idx_Order_deleted_at\""}
+[2023-08-18 11:13:28] [debug] [gorm.io/driver/sqlite.Migrator.HasTable.func1:33] trace {"elapsed": 0, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type='table' AND name=\"procedures\""}
+[2023-08-18 11:13:28] [debug] [gorm.io/gorm/migrator.Migrator.RunWithValue:71] trace {"elapsed": 0, "rows": 3, "sql": "SELECT sql FROM sqlite_master WHERE type IN (\"table\",\"index\") AND tbl_name = \"procedures\" AND sql IS NOT NULL order by type = \"table\" desc"}
+[2023-08-18 11:13:28] [debug] [gorm.io/driver/sqlite.Migrator.ColumnTypes.func1:119] trace {"elapsed": 0, "rows": -1, "sql": "SELECT * FROM `procedures` LIMIT 1"}
+[2023-08-18 11:13:28] [debug] [gorm.io/driver/sqlite.Migrator.HasIndex.func1:313] trace {"elapsed": 0, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type = \"index\" AND tbl_name = \"procedures\" AND name = \"idx_procedures_deleted_at\""}
+[2023-08-18 11:13:28] [debug] [gorm.io/driver/sqlite.Migrator.HasIndex.func1:313] trace {"elapsed": 0, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type = \"index\" AND tbl_name = \"procedures\" AND name = \"idx_procedures_order_id\""}
+[2023-08-18 11:13:28] [info] [main.main:33] apsClient start serve...
+[2023-08-18 11:13:28] [info] [apsClient/nsq.Consume:17] Consume NewNsqConsumer topic:aps.wangpengfei.scheduleTask
+[2023-08-18 11:13:42] [info] [apsClient/pkg/contextx.NewContext.func1:44] 192.168.20.120 | POST /v1/task/sendProcessParams/1 | uid: | <nil>
+[2023-08-18 11:14:03] [info] [main.shutdown:48] apsClient exited...
+[2023-08-18 11:14:09] [debug] [gorm.io/driver/sqlite.Migrator.HasTable.func1:33] trace {"elapsed": 0, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type='table' AND name=\"Order\""}
+[2023-08-18 11:14:09] [debug] [gorm.io/gorm/migrator.Migrator.RunWithValue:71] trace {"elapsed": 0.0010028, "rows": 3, "sql": "SELECT sql FROM sqlite_master WHERE type IN (\"table\",\"index\") AND tbl_name = \"Order\" AND sql IS NOT NULL order by type = \"table\" desc"}
+[2023-08-18 11:14:09] [debug] [gorm.io/driver/sqlite.Migrator.ColumnTypes.func1:119] trace {"elapsed": 0, "rows": -1, "sql": "SELECT * FROM `Order` LIMIT 1"}
+[2023-08-18 11:14:09] [debug] [gorm.io/driver/sqlite.Migrator.HasIndex.func1:313] trace {"elapsed": 0, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type = \"index\" AND tbl_name = \"Order\" AND name = \"idx_Order_deleted_at\""}
+[2023-08-18 11:14:09] [debug] [gorm.io/driver/sqlite.Migrator.HasIndex.func1:313] trace {"elapsed": 0, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type = \"index\" AND tbl_name = \"Order\" AND name = \"idx_Order_order_id\""}
+[2023-08-18 11:14:09] [debug] [gorm.io/driver/sqlite.Migrator.HasTable.func1:33] trace {"elapsed": 0, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type='table' AND name=\"procedures\""}
+[2023-08-18 11:14:09] [debug] [gorm.io/gorm/migrator.Migrator.RunWithValue:71] trace {"elapsed": 0, "rows": 3, "sql": "SELECT sql FROM sqlite_master WHERE type IN (\"table\",\"index\") AND tbl_name = \"procedures\" AND sql IS NOT NULL order by type = \"table\" desc"}
+[2023-08-18 11:14:09] [debug] [gorm.io/driver/sqlite.Migrator.ColumnTypes.func1:119] trace {"elapsed": 0, "rows": -1, "sql": "SELECT * FROM `procedures` LIMIT 1"}
+[2023-08-18 11:14:09] [debug] [gorm.io/driver/sqlite.Migrator.HasIndex.func1:313] trace {"elapsed": 0, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type = \"index\" AND tbl_name = \"procedures\" AND name = \"idx_procedures_deleted_at\""}
+[2023-08-18 11:14:09] [debug] [gorm.io/driver/sqlite.Migrator.HasIndex.func1:313] trace {"elapsed": 0, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type = \"index\" AND tbl_name = \"procedures\" AND name = \"idx_procedures_order_id\""}
+[2023-08-18 11:14:09] [info] [main.main:33] apsClient start serve...
+[2023-08-18 11:14:09] [info] [apsClient/nsq.Consume:17] Consume NewNsqConsumer topic:aps.wangpengfei.scheduleTask
+[2023-08-18 11:14:15] [info] [apsClient/pkg/contextx.NewContext.func1:44] 192.168.20.120 | POST /v1/task/sendProcessParams/1 | uid: | <nil>
+[2023-08-18 11:16:14] [info] [main.shutdown:48] apsClient exited...
+[2023-08-18 11:16:19] [debug] [gorm.io/driver/sqlite.Migrator.HasTable.func1:33] trace {"elapsed": 0, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type='table' AND name=\"Order\""}
+[2023-08-18 11:16:19] [debug] [gorm.io/gorm/migrator.Migrator.RunWithValue:71] trace {"elapsed": 0.0009753, "rows": 3, "sql": "SELECT sql FROM sqlite_master WHERE type IN (\"table\",\"index\") AND tbl_name = \"Order\" AND sql IS NOT NULL order by type = \"table\" desc"}
+[2023-08-18 11:16:19] [debug] [gorm.io/driver/sqlite.Migrator.ColumnTypes.func1:119] trace {"elapsed": 0, "rows": -1, "sql": "SELECT * FROM `Order` LIMIT 1"}
+[2023-08-18 11:16:19] [debug] [gorm.io/driver/sqlite.Migrator.HasIndex.func1:313] trace {"elapsed": 0, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type = \"index\" AND tbl_name = \"Order\" AND name = \"idx_Order_deleted_at\""}
+[2023-08-18 11:16:19] [debug] [gorm.io/driver/sqlite.Migrator.HasIndex.func1:313] trace {"elapsed": 0, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type = \"index\" AND tbl_name = \"Order\" AND name = \"idx_Order_order_id\""}
+[2023-08-18 11:16:19] [debug] [gorm.io/driver/sqlite.Migrator.HasTable.func1:33] trace {"elapsed": 0, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type='table' AND name=\"procedures\""}
+[2023-08-18 11:16:19] [debug] [gorm.io/gorm/migrator.Migrator.RunWithValue:71] trace {"elapsed": 0.0009785, "rows": 3, "sql": "SELECT sql FROM sqlite_master WHERE type IN (\"table\",\"index\") AND tbl_name = \"procedures\" AND sql IS NOT NULL order by type = \"table\" desc"}
+[2023-08-18 11:16:19] [debug] [gorm.io/driver/sqlite.Migrator.ColumnTypes.func1:119] trace {"elapsed": 0, "rows": -1, "sql": "SELECT * FROM `procedures` LIMIT 1"}
+[2023-08-18 11:16:19] [debug] [gorm.io/driver/sqlite.Migrator.HasIndex.func1:313] trace {"elapsed": 0, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type = \"index\" AND tbl_name = \"procedures\" AND name = \"idx_procedures_deleted_at\""}
+[2023-08-18 11:16:19] [debug] [gorm.io/driver/sqlite.Migrator.HasIndex.func1:313] trace {"elapsed": 0, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type = \"index\" AND tbl_name = \"procedures\" AND name = \"idx_procedures_order_id\""}
+[2023-08-18 11:16:19] [info] [main.main:33] apsClient start serve...
+[2023-08-18 11:16:19] [info] [apsClient/nsq.Consume:17] Consume NewNsqConsumer topic:aps.wangpengfei.scheduleTask
+[2023-08-18 11:16:30] [info] [apsClient/pkg/contextx.NewContext.func1:44] 192.168.20.120 | POST /v1/task/sendProcessParams/1 | uid: | <nil>
+[2023-08-18 11:16:42] [info] [apsClient/pkg/contextx.NewContext.func1:44] 192.168.20.120 | POST /v1/task/sendProcessParams/1 | uid: | <nil>
+[2023-08-18 11:16:46] [info] [apsClient/pkg/contextx.NewContext.func1:44] 192.168.20.120 | POST /v1/task/sendProcessParams/1 | uid: | <nil>
+[2023-08-18 11:16:52] [info] [main.shutdown:48] apsClient exited...
+[2023-08-18 11:16:59] [debug] [gorm.io/driver/sqlite.Migrator.HasTable.func1:33] trace {"elapsed": 0, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type='table' AND name=\"Order\""}
+[2023-08-18 11:16:59] [debug] [gorm.io/gorm/migrator.Migrator.RunWithValue:71] trace {"elapsed": 0, "rows": 3, "sql": "SELECT sql FROM sqlite_master WHERE type IN (\"table\",\"index\") AND tbl_name = \"Order\" AND sql IS NOT NULL order by type = \"table\" desc"}
+[2023-08-18 11:16:59] [debug] [gorm.io/driver/sqlite.Migrator.ColumnTypes.func1:119] trace {"elapsed": 0, "rows": -1, "sql": "SELECT * FROM `Order` LIMIT 1"}
+[2023-08-18 11:16:59] [debug] [gorm.io/driver/sqlite.Migrator.HasIndex.func1:313] trace {"elapsed": 0.0009941, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type = \"index\" AND tbl_name = \"Order\" AND name = \"idx_Order_deleted_at\""}
+[2023-08-18 11:16:59] [debug] [gorm.io/driver/sqlite.Migrator.HasIndex.func1:313] trace {"elapsed": 0, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type = \"index\" AND tbl_name = \"Order\" AND name = \"idx_Order_order_id\""}
+[2023-08-18 11:16:59] [debug] [gorm.io/driver/sqlite.Migrator.HasTable.func1:33] trace {"elapsed": 0, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type='table' AND name=\"procedures\""}
+[2023-08-18 11:16:59] [debug] [gorm.io/gorm/migrator.Migrator.RunWithValue:71] trace {"elapsed": 0, "rows": 3, "sql": "SELECT sql FROM sqlite_master WHERE type IN (\"table\",\"index\") AND tbl_name = \"procedures\" AND sql IS NOT NULL order by type = \"table\" desc"}
+[2023-08-18 11:16:59] [debug] [gorm.io/driver/sqlite.Migrator.ColumnTypes.func1:119] trace {"elapsed": 0, "rows": -1, "sql": "SELECT * FROM `procedures` LIMIT 1"}
+[2023-08-18 11:16:59] [debug] [gorm.io/driver/sqlite.Migrator.HasIndex.func1:313] trace {"elapsed": 0, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type = \"index\" AND tbl_name = \"procedures\" AND name = \"idx_procedures_deleted_at\""}
+[2023-08-18 11:16:59] [debug] [gorm.io/driver/sqlite.Migrator.HasIndex.func1:313] trace {"elapsed": 0, "rows": -1, "sql": "SELECT count(*) FROM sqlite_master WHERE type = \"index\" AND tbl_name = \"procedures\" AND name = \"idx_procedures_order_id\""}
+[2023-08-18 11:16:59] [info] [main.main:33] apsClient start serve...
+[2023-08-18 11:16:59] [info] [apsClient/nsq.Consume:17] Consume NewNsqConsumer topic:aps.wangpengfei.scheduleTask
+[2023-08-18 11:17:01] [info] [apsClient/pkg/contextx.NewContext.func1:44] 192.168.20.120 | POST /v1/task/sendProcessParams/1 | uid: | <nil>
+[2023-08-18 11:17:04] [info] [apsClient/pkg/contextx.NewContext.func1:44] 192.168.20.120 | POST /v1/task/sendProcessParams/1 | uid: | <nil>
+[2023-08-18 11:17:07] [info] [apsClient/pkg/contextx.NewContext.func1:44] 192.168.20.120 | POST /v1/task/sendProcessParams/1 | uid: | <nil>
+[2023-08-18 11:17:11] [info] [apsClient/pkg/contextx.NewContext.func1:44] 192.168.20.120 | POST /v1/task/sendProcessParams/1 | uid: | <nil>
+[2023-08-18 11:17:13] [info] [apsClient/pkg/contextx.NewContext.func1:44] 192.168.20.120 | POST /v1/task/sendProcessParams/1 | uid: | <nil>
+[2023-08-18 11:17:16] [info] [apsClient/pkg/contextx.NewContext.func1:44] 192.168.20.120 | POST /v1/task/sendProcessParams/1 | uid: | <nil>
+[2023-08-18 11:17:22] [info] [apsClient/pkg/contextx.NewContext.func1:44] 192.168.20.120 | POST /v1/task/sendProcessParams/1 | uid: | <nil>
+[2023-08-18 11:17:25] [info] [apsClient/pkg/contextx.NewContext.func1:44] 192.168.20.120 | POST /v1/task/sendProcessParams/1 | uid: | <nil>
+[2023-08-18 11:17:28] [info] [apsClient/pkg/contextx.NewContext.func1:44] 192.168.20.120 | POST /v1/task/sendProcessParams/1 | uid: | <nil>
diff --git a/model/order.go b/model/order.go
index 87e67c9..5f8022a 100644
--- a/model/order.go
+++ b/model/order.go
@@ -31,7 +31,7 @@
PageSize int
Orm *gorm.DB
Preload bool
- StartTimeMin int64
+ StartTimeMax int64
}
)
@@ -68,8 +68,8 @@
return slf
}
-func (slf *OrderSearch) SetStartTimeMin(ts int64) *OrderSearch {
- slf.StartTimeMin = ts
+func (slf *OrderSearch) SetStartTimeMax(ts int64) *OrderSearch {
+ slf.StartTimeMax = ts
return slf
}
@@ -103,8 +103,8 @@
db = db.Where("status = ?", slf.Status)
}
- if slf.StartTimeMin != 0 {
- db = db.Where("start_time >= ?", slf.StartTimeMin)
+ if slf.StartTimeMax != 0 {
+ db = db.Where("start_time <= ?", slf.StartTimeMax)
}
if slf.Preload {
diff --git a/model/procedures.go b/model/procedures.go
index 245f2e4..5ac3185 100644
--- a/model/procedures.go
+++ b/model/procedures.go
@@ -26,7 +26,7 @@
PageSize int
Orm *gorm.DB
Preload bool
- StartTimeMin int64
+ StartTimeMax int64
}
)
@@ -76,8 +76,8 @@
slf.OrderID = orderId
return slf
}
-func (slf *ProceduresSearch) SetStartTimeMin(ts int64) *ProceduresSearch {
- slf.StartTimeMin = ts
+func (slf *ProceduresSearch) SetStartTimeMax(ts int64) *ProceduresSearch {
+ slf.StartTimeMax = ts
return slf
}
@@ -111,8 +111,8 @@
db = db.Preload("InputMaterials").Preload("OutputMaterials")
}
- if slf.StartTimeMin != 0 {
- db = db.Where("start_time >= ?", slf.StartTimeMin)
+ if slf.StartTimeMax != 0 {
+ db = db.Where("start_time <= ?", slf.StartTimeMax)
}
if slf.Status != 0 {
diff --git a/router/index.go b/router/index.go
index 462624d..8da5cc4 100644
--- a/router/index.go
+++ b/router/index.go
@@ -35,9 +35,10 @@
taskApi := new(v1.TaskApi)
taskGroup := v1Group.Group("task")
{
- taskGroup.GET("get", taskApi.TaskGet) // 鑾峰彇宸ュ簭
- taskGroup.GET("start/:id", taskApi.TaskStart) // 寮�鍚伐搴忓苟鑾峰彇鍙傛暟
- taskGroup.PUT("finish/:id", taskApi.TaskFinish) // 瀹屾垚宸ュ簭
+ taskGroup.GET("get", taskApi.TaskGet) // 鑾峰彇宸ュ簭
+ taskGroup.GET("start/:id", taskApi.TaskStart) // 寮�鍚伐搴忓苟鑾峰彇鍙傛暟
+ taskGroup.PUT("finish/:id", taskApi.TaskFinish) // 瀹屾垚宸ュ簭
+ taskGroup.POST("sendProcessParams/:id", taskApi.SendProcessParams) // 涓嬪彂宸ヨ壓鍙傛暟
}
return Router
diff --git a/service/task.go b/service/task.go
index 11b543b..86ee38e 100644
--- a/service/task.go
+++ b/service/task.go
@@ -20,7 +20,7 @@
nowTs := time.Now().Unix()
orderSearch := model.NewOrderSearch(nil)
orderSearch.SetOrder("created_at asc").
- SetStartTimeMin(nowTs).
+ SetStartTimeMax(nowTs).
SetStatus(model.OrderStatusUnFinished)
var (
err error
@@ -36,7 +36,7 @@
}
procedure, err := model.NewProceduresSearch(nil).
SetOrderId(order.OrderID).
- SetStartTimeMin(nowTs).
+ SetStartTimeMax(nowTs).
SetStatus(model.ProcedureStatusUnFinished).
First()
if err == gorm.ErrRecordNotFound { //璇ヨ鍗曟湰璁惧鍏ㄩ儴宸ュ簭瀹屾垚锛屾妸璁㈠崟缃负瀹屾垚鐘舵�侊紙鍙槸瀵规湰璁惧瀹屾垚锛�
--
Gitblit v1.8.0