xinyin025/geekai
1
0
Fork 0
mirror of https://github.com/yangjian102621/geekai.git synced 2025-09-19 01:36:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

add page and total field for pagination vo

Browse Source
This commit is contained in:
RockYang 2024-09-03 18:32:15 +08:00
parent 13bf73e6cf
commit 58d127b602
21 changed files with 54 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/handler/dalle_handler.go
View File

@ -176,7 +176,7 @@ func (h *DallJobHandler) JobList(c *gin.Context) {
} }
// JobList 获取任务列表 // JobList 获取任务列表
func (h *DallJobHandler) getData(finish bool, userId uint, page int, pageSize int, publish bool) (error, []vo.DallJob) { func (h *DallJobHandler) getData(finish bool, userId uint, page int, pageSize int, publish bool) (error, vo.Page) {
session := h.DB.Session(&gorm.Session{}) session := h.DB.Session(&gorm.Session{})
if finish { if finish {
@ -194,11 +194,14 @@ func (h *DallJobHandler) getData(finish bool, userId uint, page int, pageSize in
offset := (page - 1) * pageSize offset := (page - 1) * pageSize
session = session.Offset(offset).Limit(pageSize) session = session.Offset(offset).Limit(pageSize)
} }
// 统计总数
var total int64
session.Model(&model.DallJob{}).Count(&total)
var items []model.DallJob var items []model.DallJob
res := session.Find(&items) res := session.Find(&items)
if res.Error != nil { if res.Error != nil {
return res.Error, nil return res.Error, vo.Page{}
} }
var jobs = make([]vo.DallJob, 0) var jobs = make([]vo.DallJob, 0)
@ -211,7 +214,7 @@ func (h *DallJobHandler) getData(finish bool, userId uint, page int, pageSize in
jobs = append(jobs, job) jobs = append(jobs, job)
} }
return nil, jobs return nil, vo.NewPage(total, page, pageSize, jobs)
} }
// Remove remove task image // Remove remove task image

10
api/handler/mj_handler.go
View File

@ -385,7 +385,7 @@ func (h *MidJourneyHandler) JobList(c *gin.Context) {
} }
// JobList 获取 MJ 任务列表 // JobList 获取 MJ 任务列表
func (h *MidJourneyHandler) getData(finish bool, userId uint, page int, pageSize int, publish bool) (error, []vo.MidJourneyJob) { func (h *MidJourneyHandler) getData(finish bool, userId uint, page int, pageSize int, publish bool) (error, vo.Page) {
session := h.DB.Session(&gorm.Session{}) session := h.DB.Session(&gorm.Session{})
if finish { if finish {
session = session.Where("progress >= ?", 100).Order("id DESC") session = session.Where("progress >= ?", 100).Order("id DESC")
@ -403,10 +403,14 @@ func (h *MidJourneyHandler) getData(finish bool, userId uint, page int, pageSize
session = session.Offset(offset).Limit(pageSize) session = session.Offset(offset).Limit(pageSize)
} }
// 统计总数
var total int64
session.Model(&model.MidJourneyJob{}).Count(&total)
var items []model.MidJourneyJob var items []model.MidJourneyJob
res := session.Find(&items) res := session.Find(&items)
if res.Error != nil { if res.Error != nil {
return res.Error, nil return res.Error, vo.Page{}
} }
var jobs = make([]vo.MidJourneyJob, 0) var jobs = make([]vo.MidJourneyJob, 0)
@ -426,7 +430,7 @@ func (h *MidJourneyHandler) getData(finish bool, userId uint, page int, pageSize
jobs = append(jobs, job) jobs = append(jobs, job)
} }
return nil, jobs return nil, vo.NewPage(total, page, pageSize, jobs)
} }
// Remove remove task image // Remove remove task image

10
api/handler/sd_handler.go
View File

@ -224,7 +224,7 @@ func (h *SdJobHandler) JobList(c *gin.Context) {
} }
// JobList 获取 MJ 任务列表 // JobList 获取 MJ 任务列表
func (h *SdJobHandler) getData(finish bool, userId uint, page int, pageSize int, publish bool) (error, []vo.SdJob) { func (h *SdJobHandler) getData(finish bool, userId uint, page int, pageSize int, publish bool) (error, vo.Page) {
session := h.DB.Session(&gorm.Session{}) session := h.DB.Session(&gorm.Session{})
if finish { if finish {
@ -243,10 +243,14 @@ func (h *SdJobHandler) getData(finish bool, userId uint, page int, pageSize int,
session = session.Offset(offset).Limit(pageSize) session = session.Offset(offset).Limit(pageSize)
} }
// 统计总数
var total int64
session.Model(&model.SdJob{}).Count(&total)
var items []model.SdJob var items []model.SdJob
res := session.Find(&items) res := session.Find(&items)
if res.Error != nil { if res.Error != nil {
return res.Error, nil return res.Error, vo.Page{}
} }
var jobs = make([]vo.SdJob, 0) var jobs = make([]vo.SdJob, 0)
@ -268,7 +272,7 @@ func (h *SdJobHandler) getData(finish bool, userId uint, page int, pageSize int,
jobs = append(jobs, job) jobs = append(jobs, job)
} }
return nil, jobs return nil, vo.NewPage(total, page, pageSize, jobs)
} }
// Remove remove task image // Remove remove task image

7
api/handler/video_handler.go
View File

@ -135,11 +135,16 @@ func (h *VideoHandler) List(c *gin.Context) {
t := c.Query("type") t := c.Query("type")
page := h.GetInt(c, "page", 1) page := h.GetInt(c, "page", 1)
pageSize := h.GetInt(c, "page_size", 20) pageSize := h.GetInt(c, "page_size", 20)
all := h.GetBool(c, "all")
session := h.DB.Session(&gorm.Session{}).Where("user_id", userId) session := h.DB.Session(&gorm.Session{}).Where("user_id", userId)
if t != "" { if t != "" {
session = session.Where("type", t) session = session.Where("type", t)
} }
if all {
session = session.Where("publish", 0).Where("progress", 100)
} else {
session = session.Where("user_id", h.GetLoginUserId(c))
}
// 统计总数 // 统计总数
var total int64 var total int64
session.Model(&model.VideoJob{}).Count(&total) session.Model(&model.VideoJob{}).Count(&total)

3
api/store/vo/video_job.go
View File

@ -1,5 +1,7 @@
package vo package vo
import "geekai/core/types"
type VideoJob struct { type VideoJob struct {
Id uint `json:"id"` Id uint `json:"id"`
UserId int `json:"user_id"` UserId int `json:"user_id"`
@ -16,5 +18,6 @@ type VideoJob struct {
ErrMsg string `json:"err_msg"` // 错误信息 ErrMsg string `json:"err_msg"` // 错误信息
RawData map[string]interface{} `json:"raw_data"` // 原始数据 json RawData map[string]interface{} `json:"raw_data"` // 原始数据 json
Power int `json:"power"` // 消耗算力 Power int `json:"power"` // 消耗算力
Params types.VideoParams `json:"params"` // 任务参数
CreatedAt int64 `json:"created_at"` CreatedAt int64 `json:"created_at"`
} }

BIN
web/public/files/suno.mp3
View File

Binary file not shown.

BIN
web/public/files/test.mp3
View File

Binary file not shown.

BIN
web/public/images/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 337 KiB

1
web/src/assets/css/home.styl
View File

@ -23,7 +23,6 @@
.el-image { .el-image {
width 48px width 48px
height 48px height 48px
background-color #ffffff
border-radius 50% border-radius 50%
} }
} }

1
web/src/assets/css/index.styl
View File

@ -56,7 +56,6 @@
.logo { .logo {
height 50px height 50px
background-color #ffffff
border-radius 50% border-radius 50%
} }

1
web/src/assets/css/login.styl
View File

@ -30,7 +30,6 @@
.el-image { .el-image {
width 120px; width 120px;
cursor pointer cursor pointer
background-color #ffffff
border-radius 50% border-radius 50%
} }
} }

8
web/src/views/Dalle.vue
View File

@ -206,7 +206,7 @@
import {nextTick, onMounted, onUnmounted, ref} from "vue" import {nextTick, onMounted, onUnmounted, ref} from "vue"
import {Delete, InfoFilled, Picture} from "@element-plus/icons-vue"; import {Delete, InfoFilled, Picture} from "@element-plus/icons-vue";
import {httpGet, httpPost} from "@/utils/http"; import {httpGet, httpPost} from "@/utils/http";
import {ElMessage, ElMessageBox, ElNotification} from "element-plus"; import {ElMessage, ElMessageBox} from "element-plus";
import Clipboard from "clipboard"; import Clipboard from "clipboard";
import {checkSession, getSystemInfo} from "@/store/cache"; import {checkSession, getSystemInfo} from "@/store/cache";
import {useSharedStore} from "@/store/sharedata"; import {useSharedStore} from "@/store/sharedata";
@ -338,7 +338,7 @@ const fetchRunningJobs = () => {
} }
// 获取运行中的任务 // 获取运行中的任务
httpGet(`/api/dall/jobs?finish=false`).then(res => { httpGet(`/api/dall/jobs?finish=false`).then(res => {
runningJobs.value = res.data runningJobs.value = res.data.items
}).catch(e => { }).catch(e => {
ElMessage.error("获取任务失败：" + e.message) ElMessage.error("获取任务失败：" + e.message)
}) })
@ -356,10 +356,10 @@ const fetchFinishJobs = () => {
page.value = page.value + 1 page.value = page.value + 1
httpGet(`/api/dall/jobs?finish=true&page=${page.value}&page_size=${pageSize.value}`).then(res => { httpGet(`/api/dall/jobs?finish=true&page=${page.value}&page_size=${pageSize.value}`).then(res => {
if (res.data.length < pageSize.value) { if (res.data.items.length < pageSize.value) {
isOver.value = true isOver.value = true
} }
const imageList = res.data const imageList = res.data.items
for (let i = 0; i < imageList.length; i++) { for (let i = 0; i < imageList.length; i++) {
imageList[i]["img_thumb"] = imageList[i]["img_url"] + "?imageView2/4/w/300/h/0/q/75" imageList[i]["img_thumb"] = imageList[i]["img_url"] + "?imageView2/4/w/300/h/0/q/75"
} }

4
web/src/views/ImageMj.vue
View File

@ -816,7 +816,7 @@ const fetchRunningJobs = () => {
} }
httpGet(`/api/mj/jobs?finish=false`).then(res => { httpGet(`/api/mj/jobs?finish=false`).then(res => {
const jobs = res.data const jobs = res.data.items
const _jobs = [] const _jobs = []
for (let i = 0; i < jobs.length; i++) { for (let i = 0; i < jobs.length; i++) {
if (jobs[i].progress === 101) { if (jobs[i].progress === 101) {
@ -853,7 +853,7 @@ const fetchFinishJobs = () => {
page.value = page.value + 1 page.value = page.value + 1
// 获取已完成的任务 // 获取已完成的任务
httpGet(`/api/mj/jobs?finish=true&page=${page.value}&page_size=${pageSize.value}`).then(res => { httpGet(`/api/mj/jobs?finish=true&page=${page.value}&page_size=${pageSize.value}`).then(res => {
const jobs = res.data const jobs = res.data.items
for (let i = 0; i < jobs.length; i++) { for (let i = 0; i < jobs.length; i++) {
if (jobs[i]['img_url'] !== "") { if (jobs[i]['img_url'] !== "") {
if (jobs[i].type === 'upscale' || jobs[i].type === 'swapFace') { if (jobs[i].type === 'upscale' || jobs[i].type === 'swapFace') {

7
web/src/views/ImageSd.vue
View File

@ -549,7 +549,6 @@ const sdPower = ref(0) // 画一张 SD 图片消耗算力
const socket = ref(null) const socket = ref(null)
const userId = ref(0) const userId = ref(0)
const heartbeatHandle = ref(null)
const connect = () => { const connect = () => {
let host = process.env.VUE_APP_WS_HOST let host = process.env.VUE_APP_WS_HOST
if (host === '') { if (host === '') {
@ -637,7 +636,7 @@ const fetchRunningJobs = () => {
// 获取运行中的任务 // 获取运行中的任务
httpGet(`/api/sd/jobs?finish=0`).then(res => { httpGet(`/api/sd/jobs?finish=0`).then(res => {
runningJobs.value = res.data runningJobs.value = res.data.items
}).catch(e => { }).catch(e => {
ElMessage.error("获取任务失败：" + e.message) ElMessage.error("获取任务失败：" + e.message)
}) })
@ -655,10 +654,10 @@ const fetchFinishJobs = () => {
page.value = page.value + 1 page.value = page.value + 1
httpGet(`/api/sd/jobs?finish=1&page=${page.value}&page_size=${pageSize.value}`).then(res => { httpGet(`/api/sd/jobs?finish=1&page=${page.value}&page_size=${pageSize.value}`).then(res => {
if (res.data.length < pageSize.value) { if (res.data.items.length < pageSize.value) {
isOver.value = true isOver.value = true
} }
const imageList = res.data const imageList = res.data.items
for (let i = 0; i < imageList.length; i++) { for (let i = 0; i < imageList.length; i++) {
imageList[i]["img_thumb"] = imageList[i]["img_url"] + "?imageView2/4/w/300/h/0/q/75" imageList[i]["img_thumb"] = imageList[i]["img_url"] + "?imageView2/4/w/300/h/0/q/75"
} }

4
web/src/views/ImagesWall.vue
View File

@ -355,13 +355,13 @@ const getNext = () => {
} }
httpGet(`${url}?page=${page.value}&page_size=${pageSize.value}`).then(res => { httpGet(`${url}?page=${page.value}&page_size=${pageSize.value}`).then(res => {
loading.value = false loading.value = false
if (!res.data || res.data.length === 0) { if (!res.data.items || res.data.items.length === 0) {
isOver.value = true isOver.value = true
return return
} }
// 生成缩略图 // 生成缩略图
const imageList = res.data const imageList = res.data.items
for (let i = 0; i < imageList.length; i++) { for (let i = 0; i < imageList.length; i++) {
imageList[i]["img_thumb"] = imageList[i]["img_url"] + "?imageView2/4/w/300/h/0/q/75" imageList[i]["img_thumb"] = imageList[i]["img_url"] + "?imageView2/4/w/300/h/0/q/75"
} }

1
web/src/views/Register.vue
View File

@ -340,7 +340,6 @@ const doSubmitRegister = (verifyData) => {
.el-image { .el-image {
width 120px; width 120px;
cursor pointer cursor pointer
background-color #ffffff
border-radius 50% border-radius 50%
} }
} }

1
web/src/views/admin/Login.vue
View File

@ -145,7 +145,6 @@ const doLogin = function (verifyData) {
.el-image { .el-image {
width 120px; width 120px;
cursor pointer cursor pointer
background-color #ffffff
border-radius 50% border-radius 50%
} }
} }

9
web/src/views/mobile/pages/ImageDall.vue
View File

@ -317,7 +317,7 @@ const initData = () => {
const fetchRunningJobs = () => { const fetchRunningJobs = () => {
// 获取运行中的任务 // 获取运行中的任务
httpGet(`/api/dall/jobs?finish=0`).then(res => { httpGet(`/api/dall/jobs?finish=0`).then(res => {
const jobs = res.data const jobs = res.data.items
const _jobs = [] const _jobs = []
for (let i = 0; i < jobs.length; i++) { for (let i = 0; i < jobs.length; i++) {
if (jobs[i].progress === -1) { if (jobs[i].progress === -1) {
@ -345,13 +345,14 @@ const pageSize = ref(10)
const fetchFinishJobs = (page) => { const fetchFinishJobs = (page) => {
loading.value = true loading.value = true
httpGet(`/api/dall/jobs?finish=1&page=${page}&page_size=${pageSize.value}`).then(res => { httpGet(`/api/dall/jobs?finish=1&page=${page}&page_size=${pageSize.value}`).then(res => {
if (res.data.length < pageSize.value) { const jobs = res.data.items
if (jobs.length < pageSize.value) {
finished.value = true finished.value = true
} }
if (page === 1) { if (page === 1) {
finishedJobs.value = res.data finishedJobs.value = jobs
} else { } else {
finishedJobs.value = finishedJobs.value.concat(res.data) finishedJobs.value = finishedJobs.value.concat(jobs)
} }
loading.value = false loading.value = false
}).catch(e => { }).catch(e => {

4
web/src/views/mobile/pages/ImageMj.vue
View File

@ -430,7 +430,7 @@ const connect = () => {
// 获取运行中的任务 // 获取运行中的任务
const fetchRunningJobs = (userId) => { const fetchRunningJobs = (userId) => {
httpGet(`/api/mj/jobs?finish=0&user_id=${userId}`).then(res => { httpGet(`/api/mj/jobs?finish=0&user_id=${userId}`).then(res => {
const jobs = res.data const jobs = res.data.items
const _jobs = [] const _jobs = []
for (let i = 0; i < jobs.length; i++) { for (let i = 0; i < jobs.length; i++) {
if (jobs[i].progress === -1) { if (jobs[i].progress === -1) {
@ -462,7 +462,7 @@ const fetchFinishJobs = (page) => {
loading.value = true loading.value = true
// 获取已完成的任务 // 获取已完成的任务
httpGet(`/api/mj/jobs?finish=1&page=${page}&page_size=${pageSize.value}`).then(res => { httpGet(`/api/mj/jobs?finish=1&page=${page}&page_size=${pageSize.value}`).then(res => {
const jobs = res.data const jobs = res.data.items
for (let i = 0; i < jobs.length; i++) { for (let i = 0; i < jobs.length; i++) {
if (jobs[i].progress === 101) { if (jobs[i].progress === 101) {
showNotify({ showNotify({

9
web/src/views/mobile/pages/ImageSd.vue
View File

@ -382,7 +382,7 @@ const initData = () => {
const fetchRunningJobs = () => { const fetchRunningJobs = () => {
// 获取运行中的任务 // 获取运行中的任务
httpGet(`/api/sd/jobs?finish=0`).then(res => { httpGet(`/api/sd/jobs?finish=0`).then(res => {
const jobs = res.data const jobs = res.data.items
const _jobs = [] const _jobs = []
for (let i = 0; i < jobs.length; i++) { for (let i = 0; i < jobs.length; i++) {
if (jobs[i].progress === -1) { if (jobs[i].progress === -1) {
@ -410,13 +410,14 @@ const pageSize = ref(10)
const fetchFinishJobs = (page) => { const fetchFinishJobs = (page) => {
loading.value = true loading.value = true
httpGet(`/api/sd/jobs?finish=1&page=${page}&page_size=${pageSize.value}`).then(res => { httpGet(`/api/sd/jobs?finish=1&page=${page}&page_size=${pageSize.value}`).then(res => {
if (res.data.length < pageSize.value) { const jobs = res.data.items
if (jobs.length < pageSize.value) {
finished.value = true finished.value = true
} }
if (page === 1) { if (page === 1) {
finishedJobs.value = res.data finishedJobs.value = jobs
} else { } else {
finishedJobs.value = finishedJobs.value.concat(res.data) finishedJobs.value = finishedJobs.value.concat(jobs)
} }
loading.value = false loading.value = false
}).catch(e => { }).catch(e => {

4
web/src/views/mobile/pages/ImgWall.vue
View File

@ -134,13 +134,13 @@ const onLoad = () => {
const d = data.value[activeName.value] const d = data.value[activeName.value]
httpGet(`${d.url}?status=1&page=${d.page}&page_size=${d.pageSize}&publish=true`).then(res => { httpGet(`${d.url}?status=1&page=${d.page}&page_size=${d.pageSize}&publish=true`).then(res => {
d.loading = false d.loading = false
if (res.data.length === 0) { if (res.data.items.length === 0) {
d.finished = true d.finished = true
return return
} }
// 生成缩略图 // 生成缩略图
const imageList = res.data const imageList = res.data.items
for (let i = 0; i < imageList.length; i++) { for (let i = 0; i < imageList.length; i++) {
imageList[i]["img_thumb"] = imageList[i]["img_url"] + "?imageView2/4/w/300/h/0/q/75" imageList[i]["img_thumb"] = imageList[i]["img_url"] + "?imageView2/4/w/300/h/0/q/75"
} }