public/PandaX
1
0
Fork 0
mirror of https://gitee.com/XM-GO/PandaX.git synced 2026-04-23 02:48:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

【更新】更新restful

Browse Source
This commit is contained in:
PandaGoAdmin
2022-08-03 16:00:32 +08:00
parent 2cb23c0ecf
commit 6945277fdb
48 changed files with 1234 additions and 836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
apps/job/api/job.go
View File

@@ -26,7 +26,7 @@ type JobApi struct {
// @Security X-TOKEN
func (j *JobApi) CreateJob(rc *restfulx.ReqCtx) {
var job entity.SysJob
restfulx.BindJsonAndValid(rc.GinCtx, &job)
restfulx.BindQuery(rc, &job)
job.CreateBy = rc.LoginAccount.UserName
j.JobApp.Insert(job)
@@ -44,11 +44,11 @@ func (j *JobApi) CreateJob(rc *restfulx.ReqCtx) {
// @Router /job/list [get]
// @Security
func (j *JobApi) GetJobList(rc *restfulx.ReqCtx) {
pageNum := restfulx.QueryInt(rc.GinCtx, "pageNum", 1)
pageSize := restfulx.QueryInt(rc.GinCtx, "pageSize", 10)
jobName := rc.GinCtx.Query("jobName")
jobGroup := rc.GinCtx.Query("jobGroup")
status := rc.GinCtx.Query("status")
pageNum := restfulx.QueryInt(rc, "pageNum", 1)
pageSize := restfulx.QueryInt(rc, "pageSize", 10)
jobName := restfulx.QueryParam(rc, "jobName")
jobGroup := restfulx.QueryParam(rc, "jobGroup")
status := restfulx.QueryParam(rc, "status")
list, total := j.JobApp.FindListPage(pageNum, pageSize, entity.SysJob{JobName: jobName, JobGroup: jobGroup, Status: status})
rc.ResData = map[string]any{
@@ -67,7 +67,7 @@ func (j *JobApi) GetJobList(rc *restfulx.ReqCtx) {
// @Router /job/{jobId} [get]
// @Security
func (j *JobApi) GetJob(rc *restfulx.ReqCtx) {
jobId := restfulx.PathParamInt(rc.GinCtx, rc.GinCtx.Param("jobId"))
jobId := restfulx.PathParamInt(rc, "jobId")
rc.ResData = j.JobApp.FindOne(int64(jobId))
}
@@ -83,7 +83,7 @@ func (j *JobApi) GetJob(rc *restfulx.ReqCtx) {
// @Security X-TOKEN
func (l *JobApi) UpdateJob(rc *restfulx.ReqCtx) {
var job entity.SysJob
restfulx.BindJsonAndValid(rc.GinCtx, &job)
restfulx.BindQuery(rc, &job)
l.JobApp.Update(job)
}
@@ -95,7 +95,7 @@ func (l *JobApi) UpdateJob(rc *restfulx.ReqCtx) {
// @Success 200 {string} string "{"code": 400, "message": "删除失败"}"
// @Router /job/{jobId} [delete]
func (l *JobApi) DeleteJob(rc *restfulx.ReqCtx) {
jobIds := rc.GinCtx.Param("jobId")
jobIds := restfulx.PathParam(rc, "jobId")
group := utils.IdsStrToIdsIntGroup(jobIds)
l.JobApp.Delete(group)
}
@@ -108,7 +108,7 @@ func (l *JobApi) DeleteJob(rc *restfulx.ReqCtx) {
// @Success 200 {string} string "{"code": 400, "message": "删除失败"}"
// @Router /job/stop/{jobId} [get]
func (l *JobApi) StopJobForService(rc *restfulx.ReqCtx) {
jobId := restfulx.PathParamInt(rc.GinCtx, "jobId")
jobId := restfulx.PathParamInt(rc, "jobId")
job := l.JobApp.FindOne(int64(jobId))
jobs.Remove(jobs.Crontab, job.EntryId)
}
@@ -120,7 +120,7 @@ func (l *JobApi) StopJobForService(rc *restfulx.ReqCtx) {
// @Success 200 {string} string "{"code": 400, "message": "删除失败"}"
// @Router /job/stop/{jobId} [get]
func (l *JobApi) StartJobForService(rc *restfulx.ReqCtx) {
jobId := restfulx.PathParamInt(rc.GinCtx, "jobId")
jobId := restfulx.PathParamInt(rc, "jobId")
job := l.JobApp.FindOne(int64(jobId))
biz.IsTrue(job.Status == "0", "以关闭的任务不能开启")
@@ -164,7 +164,7 @@ func (l *JobApi) StartJobForService(rc *restfulx.ReqCtx) {
// @Security X-TOKEN
func (l *JobApi) UpdateStatusJob(rc *restfulx.ReqCtx) {
var job from.JobStatus
restfulx.BindJsonAndValid(rc.GinCtx, &job)
restfulx.BindQuery(rc, &job)
l.JobApp.Update(entity.SysJob{JobId: job.JobId, Status: job.Status})
}

13
apps/job/router/job.go
View File

@@ -1,18 +1,15 @@
package router
import (
"github.com/XM-GO/PandaKit/restfulx"
"github.com/gin-gonic/gin"
"pandax/apps/job/api"
"pandax/apps/job/services"
"github.com/emicklei/go-restful/v3"
)
func InitJobRouter(router *gin.RouterGroup) {
func InitJobRouter(container *restful.Container) {
// 登录日志
jobApi := &api.JobApi{
/*jobApi := &api.JobApi{
JobApp: services.JobModelDao,
}
job := router.Group("")
job := router.Group("job")
job.GET("list", func(c *gin.Context) {
restfulx.NewReqCtx(c).WithLog("获取Job列表").Handle(jobApi.GetJobList)
@@ -44,5 +41,5 @@ func InitJobRouter(router *gin.RouterGroup) {
job.PUT("/changeStatus", func(c *gin.Context) {
restfulx.NewReqCtx(c).WithLog("修改状态").Handle(jobApi.UpdateStatusJob)
})
})*/
}