From 8d2a95fc0eeabe1b13d0a914c9ec2845d42c0be3 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期四, 19 十月 2023 11:32:57 +0800
Subject: [PATCH] 添加主从serf切换事件
---
api/v1/process_model.go | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/api/v1/process_model.go b/api/v1/process_model.go
index 5e3710d..8a03909 100644
--- a/api/v1/process_model.go
+++ b/api/v1/process_model.go
@@ -24,18 +24,15 @@
if !ok {
return
}
-
- if params.Page == 1 {
- params.PageSize--
- }
-
- list, total, err := service.GetProcessModelList(params.Page, params.PageSize, params.Number)
+ oldProcessModel, _ := service.GetProcessModelByNumber(params.Number)
+ offset, limit, push := GetOffsetAndLimit(oldProcessModel, params.Page, params.PageSize)
+ list, total, err := service.GetProcessModelList(offset, limit, params.Number)
if err != nil {
ctx.Fail(ecode.DBErr)
return
}
- oldProcessModel, _ := service.GetProcessModelByNumber(params.Number)
- if params.Page == 1 {
+
+ if push { //绮樺湪鍓嶉潰
list = append([]*model.ProcessModel{oldProcessModel}, list...)
}
for _, processModel := range list {
@@ -49,3 +46,16 @@
}
ctx.ResultList(list, total)
}
+
+func GetOffsetAndLimit(current *model.ProcessModel, page, pageSize int) (offset, limit int, push bool) {
+ offset = (page - 1) * pageSize
+ if current.IsNew {
+ offset--
+ }
+ push = current.IsNew && page == 1
+ limit = pageSize
+ if push {
+ limit--
+ }
+ return offset, limit, push
+}
--
Gitblit v1.8.0