Isaac/TrangleAgent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
RichZDS
2026-02-05 21:35:42 +08:00
parent c62b4c04ec
commit c8315469b2
22 changed files with 511 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Backend/internal/logic/Forum/boards.go Normal file
View File

@@ -0,0 +1,31 @@
package Forum
import (
v1 "TrangleAgent/api/forum/v1"
"context"
)
type sForumBoards struct{}
func NewForumBoards() *sForumBoards {
return &sForumBoards{}
}
func (s *sForumBoards) Create(ctx context.Context, req *v1.ForumBoardsCreateReq) (res *v1.ForumBoardsCreateRes, err error) {
return nil, nil
}
func (s *sForumBoards) Update(ctx context.Context, req *v1.ForumBoardsUpdateReq) (res *v1.ForumBoardsUpdateRes, err error) {
return nil, nil
}
func (s *sForumBoards) Delete(ctx context.Context, req *v1.ForumBoardsDeleteReq) (res *v1.ForumBoardsDeleteRes, err error) {
return nil, nil
}
func (s *sForumBoards) View(ctx context.Context, req *v1.ForumBoardsViewReq) (res *v1.ForumBoardsViewRes, err error) {
return nil, nil
}
func (s *sForumBoards) List(ctx context.Context, req *v1.ForumBoardsListReq) (res *v1.ForumBoardsListRes, err error) {
return nil, nil
}

31
Backend/internal/logic/Forum/comments.go Normal file
View File

@@ -0,0 +1,31 @@
package Forum
import (
v1 "TrangleAgent/api/forum/v1"
"context"
)
type sForumComments struct{}
func NewForumComments() *sForumComments {
return &sForumComments{}
}
func (s *sForumComments) Create(ctx context.Context, req *v1.ForumCommentsCreateReq) (res *v1.ForumCommentsCreateRes, err error) {
return nil, nil
}
func (s *sForumComments) Update(ctx context.Context, req *v1.ForumCommentsUpdateReq) (res *v1.ForumCommentsUpdateRes, err error) {
return nil, nil
}
func (s *sForumComments) Delete(ctx context.Context, req *v1.ForumCommentsDeleteReq) (res *v1.ForumCommentsDeleteRes, err error) {
return nil, nil
}
func (s *sForumComments) View(ctx context.Context, req *v1.ForumCommentsViewReq) (res *v1.ForumCommentsViewRes, err error) {
return nil, nil
}
func (s *sForumComments) List(ctx context.Context, req *v1.ForumCommentsListReq) (res *v1.ForumCommentsListRes, err error) {
return nil, nil
}

127
Backend/internal/logic/Forum/post.go Normal file
View File

@@ -0,0 +1,127 @@
package Forum
import (
v1 "TrangleAgent/api/forum/v1"
"TrangleAgent/internal/dao"
"TrangleAgent/internal/model"
"TrangleAgent/internal/service"
"context"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/os/gtime"
)
// sForumPosts 帖子逻辑
type sForumPosts struct{}
func NewForumPosts() *sForumPosts {
return &sForumPosts{}
}
func init() {
service.RegisterForumPosts(NewForumPosts())
}
func (s *sForumPosts) Create(ctx context.Context, req *v1.ForumPostsCreateReq) (res *v1.ForumPostsCreateRes, err error) {
//校验参数
if len(req.Title) < 5 || len(req.Title) > 100 {
return nil, gerror.New("标题长度要在5-100之间")
}
if len(req.Content) < 5 || len(req.Content) > 10000 {
return nil, gerror.New("内容长度要在5-10000之间")
}
if req.BoardId == 0 {
return nil, gerror.New("板块ID不能为空")
}
//创建帖子
insert := model.ForumPost{
BoardId: req.BoardId,
UserId: req.UserId,
Title: req.Title,
Content: req.Content,
CoverImage: req.CoverImage,
Status: req.Status,
CreatedAt: gtime.Now(),
UpdatedAt: gtime.Now(),
}
result, err := dao.ForumPosts.Ctx(ctx).Data(insert).Insert()
if err != nil {
return nil, gerror.Wrap(err, "创建帖子失败")
}
id, err := result.LastInsertId()
if err != nil {
return nil, gerror.Wrap(err, "获取帖子ID失败")
}
return &v1.ForumPostsCreateRes{Id: uint64(id)}, nil
}
func (s *sForumPosts) Update(ctx context.Context, req *v1.ForumPostsUpdateReq) (res *v1.ForumPostsUpdateRes, err error) {
//校验参数
if len(req.Title) < 5 || len(req.Title) > 100 {
return nil, gerror.New("标题长度要在5-100之间")
}
if len(req.Content) < 5 || len(req.Content) > 10000 {
return nil, gerror.New("内容长度要在5-10000之间")
}
//只能修改 帖子标题 帖子正文 帖子封面图URL
fields := []string{"title", "content", "cover_image"}
//更新帖子
_, err = dao.ForumPosts.Ctx(ctx).Data(model.ForumPost{
Id: req.Id,
Title: req.Title,
Content: req.Content,
CoverImage: req.CoverImage,
}).Fields(fields).OmitEmpty().Update()
if err != nil {
return nil, gerror.Wrap(err, "更新帖子失败")
}
return &v1.ForumPostsUpdateRes{Id: req.Id}, nil
}
func (s *sForumPosts) Delete(ctx context.Context, req *v1.ForumPostsDeleteReq) (res *v1.ForumPostsDeleteRes, err error) {
//根据id删除帖子
_, err = dao.ForumPosts.Ctx(ctx).Where(dao.ForumPosts.Columns().Id, req.Id).Delete()
if err != nil {
return nil, gerror.Wrap(err, "删除帖子失败")
}
return &v1.ForumPostsDeleteRes{}, nil
}
func (s *sForumPosts) View(ctx context.Context, req *v1.ForumPostsViewReq) (res *v1.ForumPostsViewRes, err error) {
// 根据id查询帖子
var post model.ForumPostViewParams
err = dao.ForumPosts.Ctx(ctx).Where(dao.ForumPosts.Columns().Id, req.Id).Scan(&post)
if err != nil {
return nil, gerror.Wrap(err, "查询帖子失败")
}
return &v1.ForumPostsViewRes{
ForumPostViewParams: post,
}, nil
}
func (s *sForumPosts) List(ctx context.Context, req *v1.ForumPostsListReq) (res *v1.ForumPostsListRes, err error) {
// 查询帖子列表
mod := dao.ForumPosts.Ctx(ctx)
if req.Title != "" {
mod = mod.WhereLike(dao.ForumPosts.Columns().Title, "%"+req.Title+"%")
}
if req.BoardId != 0 {
mod = mod.Where(dao.ForumPosts.Columns().BoardId, req.BoardId)
}
var list []*model.ForumPostViewParams
err = mod.Scan(&list)
if err != nil {
return nil, gerror.Wrap(err, "查询帖子列表失败")
}
return &v1.ForumPostsListRes{
List: list,
}, nil
}

224
Backend/internal/logic/ForumComments/forum_comments.go
View File

@@ -1,224 +0,0 @@
package ForumComments
import (
v1 "TrangleAgent/api/forum/v1"
"TrangleAgent/internal/dao"
"TrangleAgent/internal/model/entity"
"TrangleAgent/internal/service"
"context"
"errors"
"fmt"
"github.com/gogf/gf/v2/database/gdb"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/gtime"
)
// ForumComments 评论相关方法
type sForumComments struct{}
func init() {
service.RegisterForumComments(&sForumComments{})
}
// ForumCommentsCreate 创建评论
func (s *sForumComments) Create(ctx context.Context, req *v1.ForumCommentsCreateReq) (res *v1.ForumCommentsCreateRes, err error) {
data := &entity.ForumComments{
UserId: req.UserId,
PostId: req.PostId,
ParentId: req.ParentId,
Content: req.Content,
Status: req.Status,
LikeCount: 0,
}
result, err := dao.ForumComments.Ctx(ctx).Data(data).OmitEmpty().Insert()
if err != nil {
return nil, gerror.Wrap(err, "创建评论失败")
}
id, err := result.LastInsertId()
if err != nil {
return nil, gerror.Wrap(err, "获取评论ID失败")
}
// 更新帖子的评论数
if req.PostId > 0 {
updateData := map[string]interface{}{
dao.ForumPosts.Columns().CommentCount: gdb.Raw(fmt.Sprintf("%s + 1", dao.ForumPosts.Columns().CommentCount)),
}
_, err = dao.ForumPosts.Ctx(ctx).WherePri(req.PostId).Data(updateData).Update()
if err != nil {
g.Log().Warning(ctx, "更新帖子评论数失败:", err)
}
}
return &v1.ForumCommentsCreateRes{
Id: uint64(id),
}, nil
}
// ForumCommentsUpdate 更新评论
func (s *sForumComments) Update(ctx context.Context, req *v1.ForumCommentsUpdateReq) (res *v1.ForumCommentsUpdateRes, err error) {
// 检查评论是否存在（排除已删除的）
one, err := dao.ForumComments.Ctx(ctx).
WherePri(req.Id).
WhereNull(dao.ForumComments.Columns().DeletedAt).
One()
if err != nil {
return nil, gerror.Wrap(err, "查询评论失败")
}
if one.IsEmpty() {
return nil, errors.New("评论不存在")
}
// 更新评论
_, err = dao.ForumComments.Ctx(ctx).WherePri(req.Id).Data(req).OmitEmpty().Update()
if err != nil {
return nil, gerror.Wrap(err, "更新评论失败")
}
return &v1.ForumCommentsUpdateRes{
Id: req.Id,
}, nil
}
// ForumCommentsView 查看评论
func (s *sForumComments) View(ctx context.Context, req *v1.ForumCommentsViewReq) (res *v1.ForumCommentsViewRes, err error) {
record, err := dao.ForumComments.Ctx(ctx).
WherePri(req.Id).
WhereNull(dao.ForumComments.Columns().DeletedAt).
One()
if err != nil {
return nil, gerror.Wrap(err, "查询评论失败")
}
if record.IsEmpty() {
return nil, errors.New("评论不存在")
}
var entity *entity.ForumComments
err = record.Struct(&entity)
if err != nil {
return nil, gerror.Wrap(err, "解析评论数据失败")
}
res = &v1.ForumCommentsViewRes{
Id: entity.Id,
UserId: entity.UserId,
PostId: entity.PostId,
ParentId: entity.ParentId,
Content: entity.Content,
Status: entity.Status,
LikeCount: entity.LikeCount,
CreatedAt: entity.CreatedAt,
UpdatedAt: entity.UpdatedAt,
}
return res, nil
}
// ForumCommentsList 评论列表
func (s *sForumComments) List(ctx context.Context, req *v1.ForumCommentsListReq) (res *v1.ForumCommentsListRes, err error) {
query := dao.ForumComments.Ctx(ctx).
WhereNull(dao.ForumComments.Columns().DeletedAt).
OmitEmpty()
if req.UserId > 0 {
query = query.Where(dao.ForumComments.Columns().UserId, req.UserId)
}
if req.PostId > 0 {
query = query.Where(dao.ForumComments.Columns().PostId, req.PostId)
}
if req.ParentId > 0 {
query = query.Where(dao.ForumComments.Columns().ParentId, req.ParentId)
}
if req.Status != "" {
query = query.Where(dao.ForumComments.Columns().Status, req.Status)
}
// 分页查询
pageResult, err := query.Page(req.Page, req.PageSize).OrderDesc(dao.ForumComments.Columns().CreatedAt).All()
if err != nil {
return nil, gerror.Wrap(err, "查询评论列表失败")
}
var list []*v1.ForumCommentsViewRes
for _, record := range pageResult {
var entity *entity.ForumComments
err = record.Struct(&entity)
if err != nil {
return nil, gerror.Wrap(err, "解析评论数据失败")
}
item := &v1.ForumCommentsViewRes{
Id: entity.Id,
UserId: entity.UserId,
PostId: entity.PostId,
ParentId: entity.ParentId,
Content: entity.Content,
Status: entity.Status,
LikeCount: entity.LikeCount,
CreatedAt: entity.CreatedAt,
UpdatedAt: entity.UpdatedAt,
}
list = append(list, item)
}
total, err := query.Count()
if err != nil {
return nil, gerror.Wrap(err, "统计评论总数失败")
}
res = &v1.ForumCommentsListRes{}
res.List = list
res.Page = req.Page
res.PageSize = req.PageSize
res.Total = total
return res, nil
}
// ForumCommentsDelete 删除评论
func (s *sForumComments) Delete(ctx context.Context, req *v1.ForumCommentsDeleteReq) (res *v1.ForumCommentsDeleteRes, err error) {
// 检查评论是否存在（排除已删除的）
one, err := dao.ForumComments.Ctx(ctx).
WherePri(req.Id).
WhereNull(dao.ForumComments.Columns().DeletedAt).
One()
if err != nil {
return nil, gerror.Wrap(err, "查询评论失败")
}
if one.IsEmpty() {
return nil, errors.New("评论不存在")
}
var comment *entity.ForumComments
err = one.Struct(&comment)
if err != nil {
return nil, gerror.Wrap(err, "解析评论数据失败")
}
// 软删除评论：更新 deleted_at 和 status
updateData := map[string]interface{}{
dao.ForumComments.Columns().DeletedAt: gtime.Now(),
dao.ForumComments.Columns().Status: "deleted",
}
_, err = dao.ForumComments.Ctx(ctx).WherePri(req.Id).Data(updateData).Update()
if err != nil {
return nil, gerror.Wrap(err, "删除评论失败")
}
// 更新帖子的评论数（减少）
if comment.PostId > 0 {
updatePostData := map[string]interface{}{
dao.ForumPosts.Columns().CommentCount: gdb.Raw(fmt.Sprintf("GREATEST(0, %s - 1)", dao.ForumPosts.Columns().CommentCount)),
}
_, err = dao.ForumPosts.Ctx(ctx).WherePri(comment.PostId).Data(updatePostData).Update()
if err != nil {
g.Log().Warning(ctx, "更新帖子评论数失败:", err)
}
}
return &v1.ForumCommentsDeleteRes{}, nil
}

186
Backend/internal/logic/ForumComments/forum_posts.go
View File

@@ -1,186 +0,0 @@
package ForumComments
import (
"context"
"errors"
"TrangleAgent/api/forum/v1"
"TrangleAgent/internal/dao"
"TrangleAgent/internal/model/entity"
"TrangleAgent/internal/service"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/frame/g"
)
type sForumPosts struct{}
func init() {
service.RegisterForumPosts(&sForumPosts{})
}
// ForumPostsCreate 创建帖子
func (s *sForumPosts) Create(ctx context.Context, req *v1.ForumPostsCreateReq) (res *v1.ForumPostsCreateRes, err error) {
data := &entity.ForumPosts{
UserId: req.UserId,
Title: req.Title,
Content: req.Content,
CoverImage: req.CoverImage,
Status: req.Status,
ViewCount: 0,
LikeCount: 0,
CommentCount: 0,
}
result, err := dao.ForumPosts.Ctx(ctx).Data(data).OmitEmpty().Insert()
if err != nil {
return nil, gerror.Wrap(err, "创建帖子失败")
}
id, err := result.LastInsertId()
if err != nil {
return nil, gerror.Wrap(err, "获取帖子ID失败")
}
return &v1.ForumPostsCreateRes{
Id: uint64(id),
}, nil
}
// ForumPostsUpdate 更新帖子
func (s *sForumPosts) Update(ctx context.Context, req *v1.ForumPostsUpdateReq) (res *v1.ForumPostsUpdateRes, err error) {
// 检查帖子是否存在
one, err := dao.ForumPosts.Ctx(ctx).WherePri(req.Id).One()
if err != nil {
return nil, gerror.Wrap(err, "查询帖子失败")
}
if one.IsEmpty() {
return nil, errors.New("帖子不存在")
}
// 更新帖子
_, err = dao.ForumPosts.Ctx(ctx).WherePri(req.Id).Data(req).OmitEmpty().Update()
if err != nil {
return nil, gerror.Wrap(err, "更新帖子失败")
}
return &v1.ForumPostsUpdateRes{
Id: req.Id,
}, nil
}
// ForumPostsView 查看帖子
func (s *sForumPosts) View(ctx context.Context, req *v1.ForumPostsViewReq) (res *v1.ForumPostsViewRes, err error) {
record, err := dao.ForumPosts.Ctx(ctx).WherePri(req.Id).One()
if err != nil {
return nil, gerror.Wrap(err, "查询帖子失败")
}
if record.IsEmpty() {
return nil, errors.New("帖子不存在")
}
// 更新浏览量
_, err = dao.ForumPosts.Ctx(ctx).WherePri(req.Id).OnDuplicate("view_count", "view_count+1").Update()
if err != nil {
g.Log().Warning(ctx, "更新浏览量失败:", err)
}
var entity *entity.ForumPosts
err = record.Struct(&entity)
if err != nil {
return nil, gerror.Wrap(err, "解析帖子数据失败")
}
res = &v1.ForumPostsViewRes{
Id: entity.Id,
UserId: entity.UserId,
Title: entity.Title,
Content: entity.Content,
CoverImage: entity.CoverImage,
Status: entity.Status,
ViewCount: entity.ViewCount,
LikeCount: entity.LikeCount,
CommentCount: entity.CommentCount,
CreatedAt: entity.CreatedAt,
UpdatedAt: entity.UpdatedAt,
}
return res, nil
}
// ForumPostsList 帖子列表
func (s *sForumPosts) List(ctx context.Context, req *v1.ForumPostsListReq) (res *v1.ForumPostsListRes, err error) {
query := dao.ForumPosts.Ctx(ctx).OmitEmpty()
if req.UserId > 0 {
query = query.Where("user_id", req.UserId)
}
if req.Title != "" {
query = query.WhereLike("title", "%"+req.Title+"%")
}
if req.Status != "" {
query = query.Where("status", req.Status)
}
// 分页查询
pageResult, err := query.Page(req.Page, req.PageSize).Order("created_at DESC").All()
if err != nil {
return nil, gerror.Wrap(err, "查询帖子列表失败")
}
var list []*v1.ForumPostsViewRes
for _, record := range pageResult {
var entity *entity.ForumPosts
err = record.Struct(&entity)
if err != nil {
return nil, gerror.Wrap(err, "解析帖子数据失败")
}
item := &v1.ForumPostsViewRes{
Id: entity.Id,
UserId: entity.UserId,
Title: entity.Title,
Content: entity.Content,
CoverImage: entity.CoverImage,
Status: entity.Status,
ViewCount: entity.ViewCount,
LikeCount: entity.LikeCount,
CommentCount: entity.CommentCount,
CreatedAt: entity.CreatedAt,
UpdatedAt: entity.UpdatedAt,
}
list = append(list, item)
}
total, err := query.Count()
if err != nil {
return nil, gerror.Wrap(err, "统计帖子总数失败")
}
res = &v1.ForumPostsListRes{}
res.List = list
res.PageResult.Page = req.Page
res.PageResult.PageSize = req.PageSize
res.PageResult.Total = total
return res, nil
}
// ForumPostsDelete 删除帖子
func (s *sForumPosts) Delete(ctx context.Context, req *v1.ForumPostsDeleteReq) (res *v1.ForumPostsDeleteRes, err error) {
// 检查帖子是否存在
one, err := dao.ForumPosts.Ctx(ctx).WherePri(req.Id).One()
if err != nil {
return nil, gerror.Wrap(err, "查询帖子失败")
}
if one.IsEmpty() {
return nil, errors.New("帖子不存在")
}
// 软删除帖子
_, err = dao.ForumPosts.Ctx(ctx).WherePri(req.Id).Delete()
if err != nil {
return nil, gerror.Wrap(err, "删除帖子失败")
}
return &v1.ForumPostsDeleteRes{}, nil
}

2
Backend/internal/logic/chat/dispatchRoom.go Normal file
View File

@@ -0,0 +1,2 @@
package chat

2
Backend/internal/logic/logic.go
View File

@@ -5,7 +5,7 @@
package logic
import (
_ "TrangleAgent/internal/logic/ForumComments"
_ "TrangleAgent/internal/logic/Forum"
_ "TrangleAgent/internal/logic/containment"
_ "TrangleAgent/internal/logic/department"
_ "TrangleAgent/internal/logic/login"