From a455a9d0ca01baa985acb2b69a8d72bee982ed66 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 07 十月 2023 20:52:12 +0800
Subject: [PATCH] gorm版本v2改成v1 fix
---
model/procedures.go | 4 ++--
conf/apsClient.json | 4 ++--
model/process_model.go | 2 +-
model/work_order.go | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/conf/apsClient.json b/conf/apsClient.json
index 18ccd69..975c370 100644
--- a/conf/apsClient.json
+++ b/conf/apsClient.json
@@ -29,8 +29,8 @@
"nsqlookupdAddr":""
},
"plc": {
- "finishNumberTimeInterval": 10,
- "totalNumberTimeInterval": 100,
+ "finishNumberTimeInterval": 100,
+ "totalNumberTimeInterval": 1000,
"modbusIntType": "DINT",
"slaveId": 0,
"package": "goborrow",
diff --git a/model/procedures.go b/model/procedures.go
index 2d1cef2..b3d9e73 100644
--- a/model/procedures.go
+++ b/model/procedures.go
@@ -178,7 +178,7 @@
}
if len(slf.ProcedureIds) > 0 {
- db = db.Where("procedure_id in ?", slf.ProcedureIds)
+ db = db.Where("procedure_id IN (?)", slf.ProcedureIds)
}
if slf.ProcedureID != "" {
@@ -186,7 +186,7 @@
}
if len(slf.Channels) > 0 {
- db = db.Where("channel in ?", slf.Channels)
+ db = db.Where("channel IN (?)", slf.Channels)
}
return db
diff --git a/model/process_model.go b/model/process_model.go
index c59674e..57e73a8 100644
--- a/model/process_model.go
+++ b/model/process_model.go
@@ -110,7 +110,7 @@
}
if len(slf.Procedures) != 0 {
- db = db.Where("`procedure` in ?", slf.Procedures)
+ db = db.Where("`procedure` IN (?)", slf.Procedures)
}
if len(slf.Number) != 0 {
diff --git a/model/work_order.go b/model/work_order.go
index 834f342..f92db69 100644
--- a/model/work_order.go
+++ b/model/work_order.go
@@ -132,7 +132,7 @@
}
if len(slf.StatusList) != 0 {
- db = db.Where("status in ?", slf.StatusList)
+ db = db.Where("status IN (?)", slf.StatusList)
}
if slf.StartTimeMax != 0 {
--
Gitblit v1.8.0