Merge branch 'feature' into 'release'

2024/10/15 ai标注添加ocr传承

See merge request !128

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

@@ -15,18 +15,6 @@ public class AiApiResult {
 
     private String status;
 
-    private String info_class;
-
-    private String sent;
-
-    private String noise;
-
-    private String negLabel;
-
-    private String related;
-
-    private String sensitive;
-
     private List<AiTagRelation> tagList;
 
     private String project;
@@ -54,30 +42,6 @@ public class AiApiResult {
         this.tagList = tagList;
     }
 
-    public String getSensitive() {
-        return sensitive;
-    }
-
-    public void setSensitive(String sensitive) {
-        this.sensitive = sensitive;
-    }
-
-    public String getRelated() {
-        return related;
-    }
-
-    public void setRelated(String related) {
-        this.related = related;
-    }
-
-    public String getNegLabel() {
-        return negLabel;
-    }
-
-    public void setNegLabel(String negLabel) {
-        this.negLabel = negLabel;
-    }
-
     public String getProject() {
         return project;
     }
@@ -102,30 +66,6 @@ public class AiApiResult {
         this.status = status;
     }
 
-    public String getInfo_class() {
-        return info_class;
-    }
-
-    public void setInfo_class(String info_class) {
-        this.info_class = info_class;
-    }
-
-    public String getSent() {
-        return sent;
-    }
-
-    public void setSent(String sent) {
-        this.sent = sent;
-    }
-
-    public String getNoise() {
-        return noise;
-    }
-
-    public void setNoise(String noise) {
-        this.noise = noise;
-    }
-
     public String getResult() {
         return result;
     }

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

@@ -10,6 +10,7 @@ public enum AiInterfaceEnums {
 
     MEDIA("MEDIA"),
     REAL_SOURCE("REAL_SOURCE"),
+    OCR("OCR"),
 
     COMMON("COMMON");
 

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

@@ -150,17 +150,12 @@ public abstract class AbstractAiTaskService implements AiTaskService {
             return null;
         }
         aiApiResultTitleSubString(result);
-        if (waitRes.getString("status").equals("DONE") || (!StringUtils.isEmpty(result.getString("sent")) && StringUtils.isEmpty("dedup"))) {
+        String status = waitRes.getString("status");
+        if ("DONE".equals(status) || "DUP".equals(status) || (!StringUtils.isEmpty(result.getString("sent")) && StringUtils.isEmpty(result.getString("dedup")))) {
             AiApiResult aiRes = new AiApiResult();
             aiRes.setId(waitRes.getString("result_id"));
             aiRes.setCreateAt(System.currentTimeMillis());
-            aiRes.setInfo_class(result.getString("info_class"));
-            aiRes.setNoise(result.getString("denoise"));
-            aiRes.setSent(result.getString("sent"));
-            aiRes.setStatus(waitRes.getString("status"));
-            aiRes.setNegLabel(result.getString("neg_label"));
-            aiRes.setRelated(result.getString("related"));
-            aiRes.setSensitive(result.getString("sensitive"));
+            aiRes.setStatus(status);
             List<AiTagRelation> tagList = new ArrayList<>();
             for (String field : aiParam.getAiMark().getFields()) {
                 String value = result.getString(field);
@@ -222,25 +217,6 @@ public abstract class AbstractAiTaskService implements AiTaskService {
         return true;
     }
 
-    private String getResultValue(String relateKey, AiApiResult result) {
-        String relateValue = null;
-        switch (relateKey) {
-            case "sent" :
-                relateValue = result.getSent();
-                break;
-            case "info_class":
-                relateValue = result.getInfo_class();
-                break;
-            case "neg_label" :
-                relateValue = result.getNegLabel();
-                break;
-            case "related" :
-                relateValue = result.getRelated();
-                break;
-        }
-        return relateValue;
-    }
-
     private void aiApiResultTitleSubString(JSONObject json) {
         String title = json.getString(GenericAttribute.ES_TITLE);
         if (Objects.nonNull(title) && title.length() > 100) {

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

+package com.zhiwei.middleware.automatic.son.task.aiTask;
+
+import com.alibaba.fastjson.JSONArray;
+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;
+
+import java.util.Objects;
+
+/**
+ * author：liu-yu
+ * date: 2024/10/15 10:35
+ **/
+@Service
+public class AiTaskServiceOcr extends AbstractAiTaskService {
+
+    public AiTaskServiceOcr(RedissonUtil redissonUtil, AiApiResultDao aiApiResultDao) {
+        super(AiInterfaceEnums.OCR, redissonUtil, aiApiResultDao);
+    }
+
+    @Override
+    public JSONObject httpParamByMetadata(AiInterfaceParam aiParam) {
+        JSONObject metadata = new JSONObject();
+        JSONArray ocr_text = aiParam.getJson().getJSONArray("ocr_text");
+        if (Objects.nonNull(ocr_text)) {
+            metadata.put("ocr", ocr_text.toJavaList(String.class));
+        }
+        return metadata;
+    }
+}