Merge branch 'feature' into 'release'

2024/7/24 多项目ai标注优化、标签打印、枚举修改

See merge request !122

middleware-automatic-center-client-autoconfigure/pom.xml

@@ -11,13 +11,13 @@
     </parent>
 
     <artifactId>middleware-automatic-center-autoconfigure</artifactId>
-    <version>1.0.0.4-SNAPSHOT</version>
+    <version>${automatic.version}</version>
     <packaging>jar</packaging>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
-        <automatic.version>1.0.0.4-SNAPSHOT</automatic.version>
+        <automatic.version>1.0.0.5-SNAPSHOT</automatic.version>
     </properties>
 
     <dependencies>

middleware-automatic-center-client/pom.xml

@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>middleware-automatic-center-client</artifactId>
-    <version>1.0.0.4-SNAPSHOT</version>
+    <version>1.0.0.5-SNAPSHOT</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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

@@ -31,6 +31,11 @@ public class AIMark implements Serializable {
      * 标签对应关系
      */
     private List<TagRelation> tagRelations;
+
+    private List<String> fields;
+
+    private String methodType;
+
     /**
      * 项目名
      */
@@ -64,6 +69,14 @@ public class AIMark implements Serializable {
         this.interfaceRelation = interfaceRelation;
     }
 
+    public List<String> getFields() {
+        return fields;
+    }
+
+    public void setFields(List<String> fields) {
+        this.fields = fields;
+    }
+
     public List<TagRelation> getTagRelations() {
         return tagRelations;
     }
@@ -88,6 +101,14 @@ public class AIMark implements Serializable {
         this.projectId = projectId;
     }
 
+    public String getMethodType() {
+        return methodType;
+    }
+
+    public void setMethodType(String methodType) {
+        this.methodType = methodType;
+    }
+
     public List<Integer> getMonitorLevelIds() {
         return monitorLevelIds;
     }

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

 package com.zhiwei.middleware.automatic.server.pojo;
 
-import java.util.Objects;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * author：liu-yu
@@ -24,6 +27,8 @@ public class AiApiResult {
 
     private String sensitive;
 
+    private List<AiTagRelation> tagList;
+
     private String project;
 
     private String result;
@@ -34,28 +39,21 @@ public class AiApiResult {
     public String toString() {
         StringBuilder builder = new StringBuilder("AiApiResult{");
         builder.append("status='").append(status).append('\'');
-        if (Objects.nonNull(info_class)) {
-            builder.append(", info_class='").append(info_class).append('\'');
-        }
-        if (Objects.nonNull(sent)) {
-            builder.append(", sent='").append(sent).append('\'');
-        }
-        if (Objects.nonNull(noise)) {
-            builder.append(", noise='").append(noise).append('\'');
-        }
-        if (Objects.nonNull(negLabel)) {
-            builder.append(", negLabel='").append(negLabel).append('\'');
-        }
-        if (Objects.nonNull(related)) {
-            builder.append(", related='").append(related).append('\'');
-        }
-        if (Objects.nonNull(sensitive)) {
-            builder.append(", sensitive='").append(sensitive).append('\'');
+        if (!CollectionUtils.isEmpty(tagList)) {
+            builder.append(", aiTag='").append(tagList.stream().map(e -> " " + e.getName() + "：" + e.getValue()).collect(Collectors.joining())).append('\'');
         }
         builder.append("}");
         return builder.toString();
     }
 
+    public List<AiTagRelation> getTagList() {
+        return tagList;
+    }
+
+    public void setTagList(List<AiTagRelation> tagList) {
+        this.tagList = tagList;
+    }
+
     public String getSensitive() {
         return sensitive;
     }

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

+package com.zhiwei.middleware.automatic.server.pojo;
+
+/**
+ * author：liu-yu
+ * date: 2024/7/18 14:02
+ **/
+public class AiMarkProjectCache {
+
+    private String id;
+
+    private String project;
+
+    private String projectId;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getProject() {
+        return project;
+    }
+
+    public void setProject(String project) {
+        this.project = project;
+    }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+}

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

+package com.zhiwei.middleware.automatic.server.pojo;
+
+/**
+ * author：liu-yu
+ * date: 2024/7/15 14:56
+ **/
+public class AiTagRelation {
+
+    private String name;
+
+    private String value;
+
+    public AiTagRelation() {}
+
+    public AiTagRelation(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}

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

@@ -6,37 +6,19 @@ package com.zhiwei.middleware.automatic.server.pojo.enums;
  **/
 public enum AiInterfaceEnums {
 
-    FEI_HE("飞鹤", "62baa19f4d9a553ac3e7cd9b"),
+    PRODUCT("PRODUCT"),
 
-    LAO_XIANG_JI("老乡鸡", "665d8791b36dd11c5e453955"),
+    COMMON("COMMON");
 
-    JIA_NAN_KE_JI("嘉楠科技", "65efecab7d8b3a478260e7b6"),
+    final String type;
 
-    CHANG_XIN_CUN_CHU("长鑫存储", "65b89d4515e6c42baff23e74");
 
-    final String project;
-
-    final String projectId;
-
-    AiInterfaceEnums(String project, String projectId) {
-        this.project = project;
-        this.projectId = projectId;
+    AiInterfaceEnums(String type) {
+        this.type = type;
     }
 
-    public String getProject() {
-        return project;
+    public String getType() {
+        return type;
     }
 
-    public String getProjectId() {
-        return projectId;
-    }
-
-    public static AiInterfaceEnums create(String projectId) {
-        for (AiInterfaceEnums enums : AiInterfaceEnums.values()) {
-            if (enums.getProjectId().equals(projectId)) {
-                return enums;
-            }
-        }
-        throw new IllegalStateException("该项目不支持ai标注：" + projectId);
-    }
 }

middleware-automatic-center-server/pom.xml

@@ -21,7 +21,7 @@
         <qbjc-bean.version>1.1.4.1-SNAPSHOT</qbjc-bean.version>
         <nlp-aggree.version>0.0.5-SNAPSHOT</nlp-aggree.version>
         <dubbo-server.version>2.7.4.1</dubbo-server.version>
-        <automatic.version>1.0.0.4-SNAPSHOT</automatic.version>
+        <automatic.version>1.0.0.5-SNAPSHOT</automatic.version>
         <base.version>2.0.0-SNAPSHOT</base.version>
     </properties>
 

middleware-automatic-center-server/src/main/java/com/zhiwei/middleware/automatic/server/dao/AiMarkProjectCacheDao.java

+package com.zhiwei.middleware.automatic.server.dao;
+
+import com.zhiwei.middleware.automatic.server.pojo.AiMarkProjectCache;
+
+import java.util.List;
+
+/**
+ * author：liu-yu
+ * date: 2024/7/18 14:04
+ **/
+public interface AiMarkProjectCacheDao {
+
+    List<AiMarkProjectCache> findAll();
+}

middleware-automatic-center-server/src/main/java/com/zhiwei/middleware/automatic/server/dao/impl/AiMarkProjectCacheDaoImpl.java

+package com.zhiwei.middleware.automatic.server.dao.impl;
+
+import com.zhiwei.middleware.automatic.server.dao.AiMarkProjectCacheDao;
+import com.zhiwei.middleware.automatic.server.pojo.AiMarkProjectCache;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * author：liu-yu
+ * date: 2024/7/18 14:04
+ **/
+@Component
+public class AiMarkProjectCacheDaoImpl implements AiMarkProjectCacheDao {
+
+    private final MongoTemplate mongoTemplate;
+
+    private static final String COLLECTION_NAME = "marker_ai_mark_project";
+
+    public AiMarkProjectCacheDaoImpl(@Qualifier("markerMongoTemplate") MongoTemplate mongoTemplate) {
+        this.mongoTemplate = mongoTemplate;
+    }
+    @Override
+    public List<AiMarkProjectCache> findAll() {
+        return mongoTemplate.findAll(AiMarkProjectCache.class, COLLECTION_NAME);
+    }
+}

middleware-automatic-center-server/src/main/java/com/zhiwei/middleware/automatic/server/mission/AsyncTask.java

@@ -2,8 +2,9 @@ package com.zhiwei.middleware.automatic.server.mission;
 
 import com.zhiwei.middleware.automatic.server.common.GenericAttribute;
 import com.zhiwei.middleware.automatic.server.dao.AiMarkCountDao;
+import com.zhiwei.middleware.automatic.server.dao.AiMarkProjectCacheDao;
 import com.zhiwei.middleware.automatic.server.pojo.AiMarkCount;
-import com.zhiwei.middleware.automatic.server.pojo.enums.AiInterfaceEnums;
+import com.zhiwei.middleware.automatic.server.pojo.AiMarkProjectCache;
 import com.zhiwei.middleware.automatic.server.util.RedissonUtil;
 import com.zhiwei.middleware.automatic.server.util.TimeUtil;
 import com.zhiwei.middleware.automatic.server.util.Tools;
@@ -25,6 +26,8 @@ public class AsyncTask {
 
     private final RedissonUtil redissonUtil;
 
+    private final AiMarkProjectCacheDao aiMarkProjectCacheDao;
+
     public static Long DAY_START_TIME;
 
     public static Long DAY_END_TIME;
@@ -32,10 +35,12 @@ public class AsyncTask {
     public static String CURRENT_TIME;
 
     public AsyncTask(@Qualifier("hangzhouMongoTemplate") MongoTemplate hangZhouMongo,
-                     AiMarkCountDao aiMarkCountDao, RedissonUtil redissonUtil) {
+                     AiMarkCountDao aiMarkCountDao, RedissonUtil redissonUtil,
+                     AiMarkProjectCacheDao aiMarkProjectCacheDao) {
         this.hangZhouMongo = hangZhouMongo;
         this.aiMarkCountDao = aiMarkCountDao;
         this.redissonUtil = redissonUtil;
+        this.aiMarkProjectCacheDao = aiMarkProjectCacheDao;
     }
 
     public List<String> findAllGroup() {
@@ -60,7 +65,7 @@ public class AsyncTask {
 
     public void syncDayCount() {
         String timeKey = TimeUtil.COMMON_TIME_FORMAT.format(System.currentTimeMillis() - GenericAttribute.DAY_TIME);
-        for (AiInterfaceEnums enums : AiInterfaceEnums.values()) {
+        for (AiMarkProjectCache enums : aiMarkProjectCacheDao.findAll()) {
             AiMarkCount aiMarkCount = new AiMarkCount();
             aiMarkCount.setTime(timeKey);
             aiMarkCount.setTotal(redissonUtil.getCount(Tools.assembleKey(GenericAttribute.KEY_AI, timeKey, enums.getProject(), GenericAttribute.KEY_TOTAL)));

middleware-automatic-center-son/pom.xml

@@ -24,7 +24,7 @@
         <qbjc-bean.version>1.1.4.1-SNAPSHOT</qbjc-bean.version>
         <kafka.version>2.4.1.RELEASE</kafka.version>
         <base.version>2.0.0-SNAPSHOT</base.version>
-        <automatic.version>1.0.0.4-SNAPSHOT</automatic.version>
+        <automatic.version>1.0.0.5-SNAPSHOT</automatic.version>
         <marker.version>1.2.3-SNAPSHOT</marker.version>
         <filter.version>1.1.6-SNAPSHOT</filter.version>
         <nlp-aggree.version>0.0.5-SNAPSHOT</nlp-aggree.version>

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

@@ -41,13 +41,13 @@ public interface AiTaskService {
      */
     AiApiResult aiApiResultConversion(String interfaceRes, AiInterfaceParam aiParam);
 
-    void requestMarkTotalCount(String timeKey);
+    void requestMarkTotalCount(String timeKey, String project);
 
-    void requestErrorCount(String timeKey);
+    void requestErrorCount(String timeKey, String project);
 
-    void requestResIncomplete(String timeKey);
+    void requestResIncomplete(String timeKey, String project);
 
-    void markNotRelation(String timeKey);
+    void markNotRelation(String timeKey, String project);
 
-    void markSuccess(String timeKey);
+    void markSuccess(String timeKey, String project);
 }

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/task/aiTask/AiTaskServiceCJCC.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/7/15 11:04
- **/
-@Service
-public class AiTaskServiceCJCC extends AbstractAiTaskService {
-    public AiTaskServiceCJCC(RedissonUtil redissonUtil, AiApiResultDao aiApiResultDao) {
-        super(AiInterfaceEnums.CHANG_XIN_CUN_CHU, redissonUtil, aiApiResultDao);
-    }
-
-    @Override
-    public JSONObject httpParamByMetadata(AiInterfaceParam aiParam) {
-        return null;
-    }
-}

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/task/aiTask/AiTaskServiceLXJ.java → middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/task/aiTask/AiTaskServiceCommon.java

@@ -12,9 +12,9 @@ import org.springframework.stereotype.Service;
  * date: 2024/7/9 14:19
  **/
 @Service
-public class AiTaskServiceLXJ extends AbstractAiTaskService {
-    public AiTaskServiceLXJ(RedissonUtil redissonUtil, AiApiResultDao aiApiResultDao) {
-        super(AiInterfaceEnums.LAO_XIANG_JI, redissonUtil, aiApiResultDao);
+public class AiTaskServiceCommon extends AbstractAiTaskService {
+    public AiTaskServiceCommon(RedissonUtil redissonUtil, AiApiResultDao aiApiResultDao) {
+        super(AiInterfaceEnums.COMMON, redissonUtil, aiApiResultDao);
     }
 
     @Override

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

@@ -2,10 +2,12 @@ package com.zhiwei.middleware.automatic.son.task.aiTask;
 
 import com.zhiwei.base.entity.subclass.mark.MarkInfo;
 import com.zhiwei.middleware.automatic.server.pojo.AiInterfaceParam;
+import com.zhiwei.middleware.automatic.server.pojo.enums.AiInterfaceEnums;
 import com.zhiwei.middleware.automatic.son.task.holder.ApplicationContextHolder;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * author：liu-yu
@@ -16,7 +18,7 @@ public class AiTaskServiceHandler {
     private static final Map<String, AiTaskService> SERVICE_MAP = new HashMap<>();
     private AiTaskServiceHandler() {
         Map<String, AiTaskService> beansOfType = ApplicationContextHolder.getInstance().getBeansOfType(AiTaskService.class);
-        beansOfType.forEach((k, v) -> SERVICE_MAP.put(v.getType().getProjectId(), v));
+        beansOfType.forEach((k, v) -> SERVICE_MAP.put(v.getType().getType(), v));
     }
 
     public static AiTaskServiceHandler getInstance() {
@@ -24,7 +26,11 @@ public class AiTaskServiceHandler {
     }
 
     public MarkInfo sendAIRequest(AiInterfaceParam aiParam, String timeKey) {
-        return SERVICE_MAP.get(aiParam.getAiMark().getProjectId()).executor(aiParam, timeKey);
+        AiTaskService aiTaskService = SERVICE_MAP.get(aiParam.getAiMark().getMethodType());
+        if (Objects.isNull(aiTaskService)) {
+            aiTaskService = SERVICE_MAP.get(AiInterfaceEnums.COMMON.getType());
+        }
+        return aiTaskService.executor(aiParam, timeKey);
     }
 
     private static class AiTaskServiceHandlerHolder {

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/task/aiTask/AiTaskServiceJNKJ.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/7/10 16:43
- **/
-@Service
-public class AiTaskServiceJNKJ extends AbstractAiTaskService {
-    public AiTaskServiceJNKJ(RedissonUtil redissonUtil, AiApiResultDao aiApiResultDao) {
-        super(AiInterfaceEnums.JIA_NAN_KE_JI, redissonUtil, aiApiResultDao);
-    }
-
-    @Override
-    public JSONObject httpParamByMetadata(AiInterfaceParam aiParam) {
-        return null;
-    }
-}

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/task/aiTask/AiTaskServiceFeiHe.java → middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/task/aiTask/AiTaskServiceProduct.java

@@ -12,9 +12,9 @@ import org.springframework.stereotype.Service;
  * date: 2024/7/9 14:16
  **/
 @Service
-public class AiTaskServiceFeiHe extends AbstractAiTaskService {
-    public AiTaskServiceFeiHe(RedissonUtil redissonUtil, AiApiResultDao aiApiResultDao) {
-        super(AiInterfaceEnums.FEI_HE, redissonUtil, aiApiResultDao);
+public class AiTaskServiceProduct extends AbstractAiTaskService {
+    public AiTaskServiceProduct(RedissonUtil redissonUtil, AiApiResultDao aiApiResultDao) {
+        super(AiInterfaceEnums.PRODUCT, redissonUtil, aiApiResultDao);
     }
 
     @Override