Merge pull request 'by Robin at 20240223' (#133) from feat-20240117-001-Robin into test

Reviewed-on: #133

api/proto/imageaudittask/proto/imageaudittask_op.go

@@ -60,7 +60,7 @@ type OpListReq struct {
 	Offset                 int     `json:"offset"`
 	Limit                  int     `json:"limit"`
 	Sort                   string
-	IsAligned              *int64
+	NotAlignedOpt          int
 }
 
 type OpListData struct {

api/proto/textaudittask/proto/textaudittask_op.go

@@ -60,7 +60,7 @@ type OpListReq struct {
 	Offset                 int     `json:"offset"`
 	Limit                  int     `json:"limit"`
 	Sort                   string
-	IsAligned              *int64
+	NotAlignedOpt          int64
 }
 
 type OpListData struct {

app/mix/dao/mongo.go

@@ -2518,8 +2518,10 @@ func (m *Mongo) GetImageAuditTaskList(ctx *gin.Context, req *imageaudittaskproto
 	if req.Status != nil {
 		query["status"] = util.DerefInt64(req.Status)
 	}
-	if req.IsAligned != nil {
-		query["is_aligned"] = util.DerefInt64(req.IsAligned)
+	if req.NotAlignedOpt != 0 {
+		query["is_aligned"] = qmgo.M{
+			"$ne": consts.ImageAuditIsAligned_Yes,
+		}
 	}
 	sortClause := "-ct"
 	if req.Sort != "" {
@@ -2752,8 +2754,10 @@ func (m *Mongo) GetTextAuditTaskList(ctx *gin.Context, req *textaudittaskproto.O
 	if req.Status != nil {
 		query["status"] = util.DerefInt64(req.Status)
 	}
-	if req.IsAligned != nil {
-		query["is_aligned"] = util.DerefInt64(req.IsAligned)
+	if req.NotAlignedOpt != 0 {
+		query["is_aligned"] = qmgo.M{
+			"$ne": consts.TextAuditIsAligned_Yes,
+		}
 	}
 	sortClause := "-ct"
 	if req.Sort != "" {

app/mix/service/service.go

@@ -2480,6 +2480,9 @@ func (s *Service) OpGetImageAuditTaskVOList(ctx *gin.Context, req *imageaudittas
 		return
 	}
 
+	// 仅查询未对齐的任务
+	req.NotAlignedOpt = 1
+
 	list, err := _DefaultImageAuditTask.OpList(ctx, req)
 	if err != nil {
 		logger.Error("OpGetImageAuditTaskListByMid fail, req: %v, err: %v", util.ToJson(req), err)
@@ -2547,6 +2550,9 @@ func (s *Service) OpGetTextAuditTaskVOList(ctx *gin.Context, req *textaudittaskp
 		return
 	}
 
+	// 仅查询未对齐的任务
+	req.NotAlignedOpt = 1
+
 	list, err := _DefaultTextAuditTask.OpList(ctx, req)
 	if err != nil {
 		logger.Error("OpGetTextAuditTaskListByMid fail, req: %v, err: %v", util.ToJson(req), err)

etc/mix/mix-prod.yaml

@@ -82,7 +82,8 @@ imageaudit:
   access_key_id: "LTAI5tD2Mg5mPUDQLPZZriPJ"
   access_key_secret: "IseIbk7fMbwy0eL33J2ro4Y55mWkn4"
   #scenes: "porn terrorism ad live logo"
-  scenes: "porn terrorism live logo"
+  #scenes: "porn terrorism live logo"
+  scenes: "porn terrorism live"
   task_buffer_size: 100
   task_packet_size: 100
 

etc/mix/mix-test.yaml

@@ -81,7 +81,8 @@ imageaudit:
   access_key_id: "LTAI5tD2Mg5mPUDQLPZZriPJ"
   access_key_secret: "IseIbk7fMbwy0eL33J2ro4Y55mWkn4"
   #scenes: "porn terrorism ad live logo"
-  scenes: "porn terrorism live logo"
+  #scenes: "porn terrorism live logo"
+  scenes: "porn terrorism live"
   task_buffer_size: 100
   task_packet_size: 100