init

fn-common/pom.xml

@@ -12,12 +12,6 @@
     <artifactId>fn-common</artifactId>
     <version>1.0.0-SNAPSHOT</version>
 
-    <properties>
-        <maven.compiler.source>21</maven.compiler.source>
-        <maven.compiler.target>21</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -28,4 +22,14 @@
             <artifactId>jackson-datatype-jsr310</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.5.1</version>
+            </plugin>
+        </plugins>
+    </build>
 </project>

fn-opensearch/pom.xml

@@ -10,6 +10,8 @@
     </parent>
 
     <artifactId>fn-opensearch</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -46,4 +48,28 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <finalName>${project.artifactId}-${maven.build.timestamp}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.5.1</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <transformers>
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"/>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

fn-opensearch/src/main/java/net/yaoyi/pipeline/opensearch/OpenSearchHandler.java

@@ -16,7 +16,7 @@ import java.util.stream.Collectors;
 
 @Slf4j
 public class OpenSearchHandler implements PojoRequestHandler<TaskImageMsg, List<ImageMultiMsg>> {
-    private static final String TABLE_NAME = "";
+    private static final String TABLE_NAME = "task_image_cos_2048";
 
     private static final int TOP_K = 10;
     private static final float SCORE_THRESHOLD = 0.7f;
@@ -43,12 +43,12 @@ public class OpenSearchHandler implements PojoRequestHandler<TaskImageMsg, List<
             }
 
             // 维度一：namespace 维度
-            String nsFilter = "taskId!=" + taskId;
+            String nsFilter = String.format("sourceSendPackageDeptId = %d and taskId != %d", taskImageIndex.getSourceSendPackageDeptId(), taskImageIndex.getTaskId());
             List<TaskImageIndex.MultiResult> nsResult = knnSearch(namespace, taskImageIndex.getVector(), nsFilter, "namespace");
             List<TaskImageIndex.MultiResult> multiResultList = new ArrayList<>(nsResult);
 
             // 维度二：namespace + taskId 维度
-            String nsTaskFilter = "taskId=" + taskId + " and id!=\"" + taskImageIndex.getId() + "\"";
+            String nsTaskFilter = String.format("sourceSendPackageDeptId = %d and taskId = %d and id != '%s'", taskImageIndex.getSourceSendPackageDeptId(), taskImageIndex.getTaskId(), taskImageIndex.getId());
             List<TaskImageIndex.MultiResult> nsTaskResult = knnSearch(namespace, taskImageIndex.getVector(), nsTaskFilter, "task");
             multiResultList.addAll(nsTaskResult);
             taskImageIndex.setMultiResult(JacksonUtils.toJsonString(multiResultList));
@@ -172,6 +172,9 @@ public class OpenSearchHandler implements PojoRequestHandler<TaskImageMsg, List<
             if (fields.has("taskId")) {
                 index.setTaskId(fields.get("taskId").asLong());
             }
+            if (fields.has("sourceSendPackageDeptId")) {
+                index.setSourceSendPackageDeptId(fields.get("sourceSendPackageDeptId").asLong());
+            }
             if (fields.has("taskTypeId")) {
                 index.setTaskTypeId(fields.get("taskTypeId").asInt());
             }
@@ -248,6 +251,7 @@ public class OpenSearchHandler implements PojoRequestHandler<TaskImageMsg, List<
         index.setId(id);
         index.setNamespace(msg.getNamespace());
         index.setTaskId(msg.getTaskId());
+        index.setSourceSendPackageDeptId(msg.getSourceSendPackageDeptId());
         index.setTaskTypeId(msg.getTaskTypeId());
         index.setUserId(msg.getUserId());
         index.setStatus(msg.getStatus());

fn-rabbitmq/pom.xml

@@ -51,4 +51,27 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <finalName>${project.artifactId}-${maven.build.timestamp}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.5.1</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"/>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

fn-rabbitmq/src/main/java/net/yao/pipeline/rabbitmq/RabbitConsumer.java → fn-rabbitmq/src/main/java/net/yaoyi/pipeline/rabbitmq/RabbitConsumer.java

@@ -1,4 +1,4 @@
-package net.yao.pipeline.rabbitmq;
+package net.yaoyi.pipeline.rabbitmq;
 
 import com.aliyun.fc.runtime.Context;
 import com.aliyun.fc.runtime.PojoRequestHandler;
@@ -11,6 +11,7 @@ import okhttp3.*;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
@@ -18,7 +19,7 @@ import java.util.concurrent.TimeoutException;
  * RabbitMQ 消费者 - 阿里云函数计算实现
  */
 @Slf4j
-public class RabbitConsumer implements PojoRequestHandler<String, Void> {
+public class RabbitConsumer implements PojoRequestHandler<Map<String,Object>, Void> {
 
     private static final String RABBITMQ_HOST = "rabbitmq-cn-39y4twfud01-cn-beijing-vpc.mq.amqp.aliyuncs.com";
     private static final int RABBITMQ_PORT = 5672;
@@ -40,7 +41,7 @@ public class RabbitConsumer implements PojoRequestHandler<String, Void> {
     private static final MediaType JSON = MediaType.get("application/json; charset=utf-8");
 
     @Override
-    public Void handleRequest(String input, Context context) {
+    public Void handleRequest(Map<String,Object> input, Context context) {
         log.info("函数计算启动, Request ID: {}", context.getRequestId());
 
         try {
@@ -53,6 +54,12 @@ public class RabbitConsumer implements PojoRequestHandler<String, Void> {
             log.error("启动 RabbitMQ 消费者失败", e);
             throw new RuntimeException("启动失败: " + e.getMessage(), e);
         }
+
+        try {
+            Thread.sleep(3000);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
         return null;
     }
 

pom.xml

@@ -19,6 +19,7 @@
     <properties>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <lombok.version>1.18.30</lombok.version>
         <org.mapstruct.version>1.4.2.Final</org.mapstruct.version>
         <guava.version>33.0.0-jre</guava.version>

yyc-pipeline-model/pom.xml

@@ -17,4 +17,13 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.5.1</version>
+            </plugin>
+        </plugins>
+    </build>
 </project>

yyc-pipeline-model/src/main/java/net/yaoyi/pipeline/model/index/TaskImageIndex.java

@@ -8,6 +8,7 @@ import java.util.List;
 public class TaskImageIndex {
     private String id;
     private String namespace;
+    private Long sourceSendPackageDeptId;
     private Long taskId;
     private Integer taskTypeId;
     private Long userId;

yyc-pipeline-model/src/main/java/net/yaoyi/pipeline/model/mq/TaskImageMsg.java

@@ -6,6 +6,7 @@ import net.yaoyi.pipeline.model.AlgoBaseInfo;
 @Data
 public class TaskImageMsg extends AlgoBaseInfo {
     private String namespace;
+    private Long sourceSendPackageDeptId;
     private Long taskId;
     private Integer taskTypeId;
     private Long userId;