From 3e438843c57c2e3525c14832eb26e5ac343b817c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 07 十月 2023 14:57:37 +0800
Subject: [PATCH] merge
---
service/process_model.go | 44 ++++++++++++--------------------------------
1 files changed, 12 insertions(+), 32 deletions(-)
diff --git a/service/process_model.go b/service/process_model.go
index 7b70e66..c4ff7dd 100644
--- a/service/process_model.go
+++ b/service/process_model.go
@@ -1,37 +1,17 @@
package service
-type ProcessModel struct{}
-
-const (
- GetProcessModelUrl = "/api-s/v1/processParams/info"
+import (
+ "apsClient/conf"
+ "apsClient/model"
)
-type GetProcessModelParams struct {
- WorkOrder string `json:"workOrder,omitempty" form:"workOrder"` //宸ュ簭缂栧彿
- OrderId string `json:"orderId"` // 璁㈠崟鍙�
- Product string `json:"password"` // 浜у搧
- Procedure string `json:"procedure"` // 宸ュ簭
- Device string `json:"device"` // 璁惧
+func GetProcessModelList(page, pageSize int) (list []*model.ProcessModel, total int64, err error) {
+ device, err := model.NewDeviceSearch().SetDeviceId(conf.Conf.System.DeviceId).First()
+ if err != nil {
+ return
+ }
+ list, total, err = model.NewProcessModelSearch().
+ SetIsNew(true).SetOrder("id desc").
+ SetPage(page, pageSize).SetProcedures(device.ProceduresArr).Find()
+ return
}
-type GetProcessModel struct {
- Number string `json:"number"` //宸ヨ壓妯″瀷缂栧彿
- OrderId string `json:"orderId"` //璁㈠崟id
- Product string `json:"product"` //浜у搧鍚嶇О
- Procedure string `json:"procedure"` //宸ュ簭
- WorkOrder string `json:"workOrder"` //宸ュ崟
- Device string `json:"device"` //璁惧
- ParamsMap map[string]interface{} `json:"paramsMap"`
-}
-
-type GetProcessModelResponse struct {
- Code int
- Msg string
- Data GetProcessModel
-}
-
-//// GetProcessModel 鑾峰彇宸ヨ壓妯″瀷
-//func (slf ProcessModel) GetProcessModel(params GetProcessModelParams) (GetProcessModel GetProcessModel, err error) {
-// resp := new(GetProcessModelResponse)
-// err = httpx.SendPostAndParseJson(conf.Conf.Services.ApsServer+GetProcessModelUrl, params, resp)
-// return resp.Data, err
-//}
--
Gitblit v1.8.0