diff --git a/controller/plan.go b/controller/plan.go index 757fc8f..26a1b20 100644 --- a/controller/plan.go +++ b/controller/plan.go @@ -164,18 +164,14 @@ func (this *PlanController) CreateUndo(c *gin.Context) { resp.Status = 0 } -func (this *PlanController) UpdateUndo(c *gin.Context) { +func (this *PlanController) UnFinishUndo(c *gin.Context) { resp := RespBase{} defer func() { c.JSON(200, resp) }() - var req model.Book - e := c.BindJSON(&req) - if nil != e { - resp.Msg = "wrong input" - return - } - e = db.GetOrm().Model(&model.Book{}).Update(&req).Error + id := c.Param("id") + + e := db.GetOrm().Exec(fmt.Sprintf("update background.`undo` set done = '0' where id = '%s'",id )).Error if nil != e { logs.Error(e.Error()) return @@ -185,6 +181,62 @@ func (this *PlanController) UpdateUndo(c *gin.Context) { resp.Status = 0 } +func (this *PlanController) FinishUndo(c *gin.Context) { + resp := RespBase{} + defer func() { + c.JSON(200, resp) + }() + id := c.Param("id") + log.Print("finish undo id",id) + + e := db.GetOrm().Exec(fmt.Sprintf("update background.`undo` set done = 1 where id = '%s'",id )).Error + log.Print(fmt.Sprintf("update undo set done = 1 where id = %d",1 )) + if nil != e { + logs.Error(e.Error()) + return + } + resp.Data = nil + resp.Msg = "OK" + resp.Status = 0 +} + +func (this *PlanController) UpdateUndo(c *gin.Context) { + resp := RespBase{} + defer func() { + c.JSON(200, resp) + }() + var req model.Undo + e := c.BindJSON(&req) + if nil != e { + resp.Msg = "wrong input" + return + } + e = db.GetOrm().Model(&model.Undo{}).Update(&req).Error + if nil != e { + logs.Error(e.Error()) + return + } + resp.Data = nil + resp.Msg = "OK" + resp.Status = 0 +} + +func (this *PlanController) GetDone(c *gin.Context) { + resp := RespBase{} + defer func() { + c.JSON(200, resp) + }() + undos := []model.Undo{} + e := db.GetOrm().Model(&model.Undo{}).Where("done = 1").Find(&undos).Error + if nil != e { + log.Print(e.Error()) + return + } + resp.Data = undos + resp.Msg = "OK" + resp.Status = 0 +} + func (this *PlanController) GetUndo(c *gin.Context) { resp := RespBase{} defer func() { diff --git a/main.go b/main.go index 823f76f..60f31bc 100644 --- a/main.go +++ b/main.go @@ -136,10 +136,9 @@ func main() { api.PUT("/article", controller.AddArticle) // 添加文章 api.PUT("/article_search", controller.SearchArticles) // 添加文章 api.GET("/article_type", controller.ArticlesType) //获取所有文章分类 - api.PUT("/article_type", controller.AddArticleType) - api.DELETE("/article_type", controller.DeleteArticleType) - api.POST("/doc_search_term",controller.SearchArticleES) - + api.PUT("/article_type", controller.AddArticleType) // 添加文章分类 + api.DELETE("/article_type", controller.DeleteArticleType) // 删除文章分类 + api.POST("/doc_search_term",controller.SearchArticleES) // 文章内容搜索,基于es的倒排 api.POST("/article_update", controller.UpdateArtilce) //更新文章 api.GET("/articleCount", controller.GetArticleCount) //获取所有文章个数 @@ -161,16 +160,17 @@ func main() { api.POST("/memo", controller.UpdateMemo) // 备忘录更新 api.POST("/memos", controller.GetMemos) // 备忘录批量 api.POST("/delmemo", controller.DeleteMemos) //删除备忘录 - api.GET("/memo", controller.GetMemo) // 单独读取 + api.GET("/memo", controller.GetMemo) // 单独读取备忘录 + + api.GET("doc_groups", controller.GetDocGroup) // 获取所有的文章分组 api.POST("type_group", controller.GetDocTypeGroup) // 获取类所在的组 api.POST("group_type", controller.GetDoGroupcType) // 获取类所在的组 - api.GET("doc_versions", nil) // 获取文章的某个版本 - api.PUT("/book", controller.CreateBook) // - api.POST("/book", controller.UpdateBook) // + api.PUT("/book", controller.CreateBook) //新建书籍 + api.POST("/book", controller.UpdateBook) // 更新书籍 api.POST("/getbook", controller.GetBook) // 单书籍数据 api.POST("/getbooks", controller.GetPageBook) // 批量书籍 api.POST("/delbook", controller.Delbook) // 删除书籍 @@ -182,26 +182,28 @@ func main() { api.POST("/plan_days", planController.PlanDay) // 获取本月有计划天数 api.GET("/plan_types", planController.Types) - api.PUT("/undo", planController.CreateUndo) - api.POST("/undo", planController.UpdateUndo) - api.GET("/undo", planController.GetUndo) - api.DELETE("/undo/:id", planController.DeleteUndo) - - - api.PUT("/doc_template",controller.CreateDocTemplate) - api.POST("/doc_template",controller.UpdateDocTemplate) - api.POST("/get_doc_template",controller.GetDocTemplate) - api.DELETE("/doc_template/:id",controller.DeleteDocTemplate) - api.GET("/doc_template/:id",controller.GetDocTemplateId) + api.PUT("/undo", planController.CreateUndo) // 新增待办事项 + api.POST("/undo", planController.UpdateUndo) // 更新待办事项 + api.POST("/undo_finish/:id", planController.FinishUndo) // 完成待办事项 + api.POST("/undo_unfinish/:id", planController.UnFinishUndo) // 已完成事项改未完成 + api.GET("/undo", planController.GetUndo) // 获得待办事项 + api.GET("/done", planController.GetDone) // 获得待办事项 + api.DELETE("/undo/:id", planController.DeleteUndo) // 删除待办事项 + + api.PUT("/doc_template",controller.CreateDocTemplate) // 创建文章模板 + api.POST("/doc_template",controller.UpdateDocTemplate) // 更新文章模板 + api.POST("/get_doc_template",controller.GetDocTemplate) // 获得文章模板 + api.DELETE("/doc_template/:id",controller.DeleteDocTemplate) // 删除文章模板 + api.GET("/doc_template/:id",controller.GetDocTemplateId) //获得单个文章模板信息 } openapi := r.Group("openapi") { - openapi.POST("/diff") - openapi.POST("/ddl2orm", openapiController.DDL2ORM) - openapi.POST("/ddl2markdown", openapiController.DDL2Markdown) - openapi.POST("/ui2css", openapiController.UI2CSS) + openapi.POST("/diff") // 比较两个文档差异 + openapi.POST("/ddl2orm", openapiController.DDL2ORM) // sql ddl转gorm 结构体 + openapi.POST("/ddl2markdown", openapiController.DDL2Markdown) // sql ddl转markdown 文档 + openapi.POST("/ui2css", openapiController.UI2CSS) // qt ui文件转css文档 } e := r.Run(":" + strconv.Itoa(config.GetPort())) if nil != e { diff --git a/test/portData_test.go b/test/portData_test.go index 308f5c3..725dc0e 100644 --- a/test/portData_test.go +++ b/test/portData_test.go @@ -59,10 +59,10 @@ func TestPortDocToElastic(t *testing.T) { InitRedisConfig() InitMysql() db.InitELK() - // e := model.PortDocumentToElasticsearch("doc") - // if nil != e { - // log.Print(e.Error()) - // } + e := model.PortDocumentToElasticsearch("doc") + if nil != e { + log.Print(e.Error()) + } } func TestReflect(t *testing.T) {