Merge branch 'feature' into 'release'

2024/07/27 ai标注新增media传参

See merge request !124

middleware-automatic-center-client/src/main/java/com/zhiwei/middleware/automatic/server/pojo/enums/AiInterfaceEnums.java

@@ -8,6 +8,8 @@ public enum AiInterfaceEnums {
 
     PRODUCT("PRODUCT"),
 
+    MEDIA("MEDIA"),
+
     COMMON("COMMON");
 
     final String type;

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/task/aiTask/AbstractAiTaskService.java

@@ -76,7 +76,7 @@ public abstract class AbstractAiTaskService implements AiTaskService {
         }
         JSONObject json = aiParam.getJson();
         String mtag = tagRelationList.stream().map(AIMark.TagRelation::getUniqueId).collect(Collectors.joining());
-        String logTag = tagRelationList.stream().map(AIMark.TagRelation::getName).collect(Collectors.joining());
+        String logTag = tagRelationList.stream().map(AIMark.TagRelation::getName).collect(Collectors.joining(","));
         json.put(GenericAttribute.ES_M_TAG, mtag);
         json.put(GenericAttribute.ES_M_PERSON, GenericAttribute.AI_PERSON);
         json.put(GenericAttribute.ES_M_TIME, System.currentTimeMillis());

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/task/aiTask/AiTaskServiceMedia.java

+package com.zhiwei.middleware.automatic.son.task.aiTask;
+
+import com.alibaba.fastjson.JSONObject;
+import com.zhiwei.middleware.automatic.server.pojo.AiInterfaceParam;
+import com.zhiwei.middleware.automatic.server.pojo.enums.AiInterfaceEnums;
+import com.zhiwei.middleware.automatic.server.util.RedissonUtil;
+import com.zhiwei.middleware.automatic.son.dao.AiApiResultDao;
+import org.springframework.stereotype.Service;
+
+/**
+ * author：liu-yu
+ * date: 2024/8/27 11:27
+ **/
+@Service
+public class AiTaskServiceMedia extends AbstractAiTaskService {
+
+    public AiTaskServiceMedia(RedissonUtil redissonUtil, AiApiResultDao aiApiResultDao) {
+        super(AiInterfaceEnums.MEDIA, redissonUtil, aiApiResultDao);
+    }
+
+    @Override
+    public JSONObject httpParamByMetadata(AiInterfaceParam aiParam) {
+        JSONObject metadata = new JSONObject();
+        metadata.put("media_type", aiParam.getPt());
+        return metadata;
+    }
+}

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/task/service/TaskServiceAiMark.java

@@ -73,7 +73,7 @@ public class TaskServiceAiMark implements TaskService {
                     list.add(markInfo);
                 }
             } catch (Exception e) {
-                log.error("ai标注失败，数据id：{}，错误信息：" , param.getJson().getString("_id"), e);
+                log.error("ai标注失败，数据id：{}，错误信息：" , param.getJson().getString("id"), e);
             }
         }
         dubboHandler.markUpsert(list);