pig/pig-farm-controller
1
0
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects Releases Wiki Activity

ListUserActionLogs

Browse Source
This commit is contained in:
huang
2025-10-18 15:47:13 +08:00
parent fab26ffca4
commit bcdcaa5631
5 changed files with 170 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
internal/app/controller/monitor/monitor_controller.go
View File

@@ -263,3 +263,53 @@ func (c *Controller) ListPendingCollections(ctx *gin.Context) {
c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(data), total)
controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取待采集请求成功", resp, actionType, "获取待采集请求成功", req)
}
// ListUserActionLogs godoc
// @Summary 获取用户操作日志列表
// @Description 根据提供的过滤条件，分页获取用户操作日志
// @Tags 数据监控
// @Security BearerAuth
// @Produce json
// @Param query query dto.ListUserActionLogRequest true "查询参数"
// @Success 200 {object} controller.Response{data=dto.ListUserActionLogResponse}
// @Router /api/v1/monitor/user-action-logs [get]
func (c *Controller) ListUserActionLogs(ctx *gin.Context) {
const actionType = "获取用户操作日志列表"
var req dto.ListUserActionLogRequest
if err := ctx.ShouldBindQuery(&req); err != nil {
c.logger.Errorf("%s: 参数绑定失败: %v", actionType, err)
controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的查询参数: "+err.Error(), actionType, "参数绑定失败", req)
return
}
opts := repository.UserActionLogListOptions{
UserID: req.UserID,
Username: req.Username,
ActionType: req.ActionType,
OrderBy: req.OrderBy,
StartTime: req.StartTime,
EndTime: req.EndTime,
}
if req.Status != nil {
status := models.AuditStatus(*req.Status)
opts.Status = &status
}
data, total, err := c.monitorService.ListUserActionLogs(opts, req.Page, req.PageSize)
if err != nil {
if errors.Is(err, repository.ErrInvalidPagination) {
c.logger.Warnf("%s: 无效的分页参数: %v", actionType, err)
controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的分页参数: "+err.Error(), actionType, "无效分页参数", req)
return
}
c.logger.Errorf("%s: 服务层查询失败: %v", actionType, err)
controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取用户操作日志失败: "+err.Error(), actionType, "服务层查询失败", req)
return
}
resp := dto.NewListUserActionLogResponse(data, total, req.Page, req.PageSize)
c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(data), total)
controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取用户操作日志成功", resp, actionType, "获取用户操作日志成功", req)
}

12
internal/app/controller/user/user_controller.go
View File

@@ -165,13 +165,11 @@ func (c *Controller) ListUserHistory(ctx *gin.Context) {
// 3. 调用审计仓库层获取历史数据
id := uint(userID)
findOptions := repository.FindAuditLogOptions{
findOptions := repository.UserActionLogListOptions{
UserID: &id,
ActionType: actionTypeFilter,
Page: page,
PageSize: pageSize,
ActionType: &actionTypeFilter,
}
logs, total, err := c.auditRepo.List(findOptions)
l, total, err := c.auditRepo.List(findOptions, page, pageSize)
if err != nil {
c.logger.Errorf("%s: 查询历史记录失败: %v, Options: %+v", actionType, err, findOptions)
controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "查询历史记录失败", actionType, "查询历史记录失败", findOptions)
@@ -179,8 +177,8 @@ func (c *Controller) ListUserHistory(ctx *gin.Context) {
}
// 4. 将数据库模型转换为响应 DTO
historyResponses := make([]dto.HistoryResponse, 0, len(logs))
for _, log := range logs {
historyResponses := make([]dto.HistoryResponse, 0, len(l))
for _, log := range l {
historyResponses = append(historyResponses, dto.HistoryResponse{
UserID: log.UserID,
Username: log.Username,

67
internal/app/dto/monitor_dto.go
View File

@@ -300,3 +300,70 @@ func NewListPendingCollectionResponse(data []models.PendingCollection, total int
},
}
}
// --- UserActionLog ---
// ListUserActionLogRequest 定义了获取用户操作日志列表的请求参数
type ListUserActionLogRequest struct {
Page int `form:"page,default=1"`
PageSize int `form:"pageSize,default=10"`
UserID *uint `form:"user_id"`
Username *string `form:"username"`
ActionType *string `form:"action_type"`
Status *string `form:"status"`
StartTime *time.Time `form:"start_time" time_format:"rfc3339"`
EndTime *time.Time `form:"end_time" time_format:"rfc3339"`
OrderBy string `form:"order_by"`
}
// UserActionLogDTO 是用于API响应的用户操作日志结构
type UserActionLogDTO struct {
ID uint `json:"id"`
Time time.Time `json:"time"`
UserID uint `json:"user_id"`
Username string `json:"username"`
SourceIP string `json:"source_ip"`
ActionType string `json:"action_type"`
TargetResource json.RawMessage `json:"target_resource"`
Description string `json:"description"`
Status models.AuditStatus `json:"status"`
HTTPPath string `json:"http_path"`
HTTPMethod string `json:"http_method"`
ResultDetails string `json:"result_details"`
}
// ListUserActionLogResponse 是获取用户操作日志列表的响应结构
type ListUserActionLogResponse struct {
List []UserActionLogDTO `json:"list"`
Pagination PaginationDTO `json:"pagination"`
}
// NewListUserActionLogResponse 从模型数据创建列表响应 DTO
func NewListUserActionLogResponse(data []models.UserActionLog, total int64, page, pageSize int) *ListUserActionLogResponse {
dtos := make([]UserActionLogDTO, len(data))
for i, item := range data {
dtos[i] = UserActionLogDTO{
ID: item.ID,
Time: item.Time,
UserID: item.UserID,
Username: item.Username,
SourceIP: item.SourceIP,
ActionType: item.ActionType,
TargetResource: json.RawMessage(item.TargetResource),
Description: item.Description,
Status: item.Status,
HTTPPath: item.HTTPPath,
HTTPMethod: item.HTTPMethod,
ResultDetails: item.ResultDetails,
}
}
return &ListUserActionLogResponse{
List: dtos,
Pagination: PaginationDTO{
Total: total,
Page: page,
PageSize: pageSize,
},
}
}

8
internal/app/service/monitor_service.go
View File

@@ -11,6 +11,7 @@ type MonitorService struct {
deviceCommandLogRepo repository.DeviceCommandLogRepository
executionLogRepo repository.ExecutionLogRepository
pendingCollectionRepo repository.PendingCollectionRepository
userActionLogRepo repository.UserActionLogRepository
// 在这里可以添加其他超表模型的仓库依赖
}
@@ -20,12 +21,14 @@ func NewMonitorService(
deviceCommandLogRepo repository.DeviceCommandLogRepository,
executionLogRepo repository.ExecutionLogRepository,
pendingCollectionRepo repository.PendingCollectionRepository,
userActionLogRepo repository.UserActionLogRepository,
) *MonitorService {
return &MonitorService{
sensorDataRepo: sensorDataRepo,
deviceCommandLogRepo: deviceCommandLogRepo,
executionLogRepo: executionLogRepo,
pendingCollectionRepo: pendingCollectionRepo,
userActionLogRepo: userActionLogRepo,
}
}
@@ -53,3 +56,8 @@ func (s *MonitorService) ListTaskExecutionLogs(opts repository.TaskExecutionLogL
func (s *MonitorService) ListPendingCollections(opts repository.PendingCollectionListOptions, page, pageSize int) ([]models.PendingCollection, int64, error) {
return s.pendingCollectionRepo.List(opts, page, pageSize)
}
// ListUserActionLogs 负责处理查询用户操作日志列表的业务逻辑
func (s *MonitorService) ListUserActionLogs(opts repository.UserActionLogListOptions, page, pageSize int) ([]models.UserActionLog, int64, error) {
return s.userActionLogRepo.List(opts, page, pageSize)
}