dcs 2 dagar sedan
förälder
incheckning
3b221fa705

+ 30 - 0
virgo.api/src/main/java/com/bosshand/virgo/api/workark/model/DifyWorkFlow.java

@@ -40,6 +40,12 @@ public class DifyWorkFlow {
 
     private int totalTokens;
 
+    private int type;
+
+    private int insertType;
+
+    private long organizationId;
+
     public Long getId() {
         return id;
     }
@@ -159,4 +165,28 @@ public class DifyWorkFlow {
     public void setTotalTokens(int totalTokens) {
         this.totalTokens = totalTokens;
     }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public int getInsertType() {
+        return insertType;
+    }
+
+    public void setInsertType(int insertType) {
+        this.insertType = insertType;
+    }
+
+    public long getOrganizationId() {
+        return organizationId;
+    }
+
+    public void setOrganizationId(long organizationId) {
+        this.organizationId = organizationId;
+    }
 }

+ 10 - 11
virgo.api/src/main/java/com/bosshand/virgo/api/workark/service/DifyService.java

@@ -119,7 +119,16 @@ public class DifyService {
                 @Override
                 public void onWorkflowStarted(WorkflowStartedEvent event) {
                     System.out.println("工作流开始: " + event);
-                    startedEvent(userContext.getUserId(), difyTypeId, event.getWorkflowRunId(), simpleUUID);
+                    DifyWorkFlow difyWorkFlow = new DifyWorkFlow();
+                    difyWorkFlow.setSimpleUUID(simpleUUID);
+                    difyWorkFlow.setDifyTypeId(difyTypeId);
+                    difyWorkFlow.setUserId(userContext.getUserId());
+                    difyWorkFlow.setType((int) inputs.get("type"));
+                    difyWorkFlow.setInsertType((int) inputs.get("insertType"));
+                    difyWorkFlow.setOrganizationId((long) inputs.get("organizationId"));
+                    difyWorkFlow.setWorkflowRunId(event.getWorkflowRunId());
+                    difyWorkFlow.setStatus("running");
+                    difyWorkFlowDao.save(difyWorkFlow);
                 }
 
                 @Override
@@ -155,16 +164,6 @@ public class DifyService {
         return simpleUUID;
     }
 
-    private void startedEvent(long userId, long difyTypeId, String workflowRunId, String simpleUUID) {
-        DifyWorkFlow difyWorkFlow = new DifyWorkFlow();
-        difyWorkFlow.setSimpleUUID(simpleUUID);
-        difyWorkFlow.setDifyTypeId(difyTypeId);
-        difyWorkFlow.setUserId(userId);
-        difyWorkFlow.setWorkflowRunId(workflowRunId);
-        difyWorkFlow.setStatus("running");
-        difyWorkFlowDao.save(difyWorkFlow);
-    }
-
     public DifyWorkFlow getWorkFlow(String simpleUUID) {
         DifyWorkFlow df = difyWorkFlowDao.getSimpleUUID(simpleUUID);
         if (df.getStatus().equals("succeeded")) {

+ 14 - 2
virgo.api/src/main/resources/mapper/DifyWorkFlowMapper.xml

@@ -18,11 +18,14 @@
         <result column="error" property="error"/>
         <result column="totalSteps" property="totalSteps"/>
         <result column="totalTokens" property="totalTokens"/>
+        <result column="type" property="type"/>
+        <result column="insertType" property="insertType"/>
+        <result column="organizationId" property="organizationId"/>
     </resultMap>
 
     <insert id="save" parameterType="com.bosshand.virgo.api.workark.model.DifyWorkFlow" useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO dify_work_flow(`simpleUUID`, `difyTypeId`, `date`, `userId`, `workflowRunId`, `status`, `inputs`, `outputs`, `createdAt`, `finishedAt`, `elapsedTime`, `error`, `totalSteps`, `totalTokens`)
-        VALUES (#{simpleUUID}, #{difyTypeId}, now(), #{userId}, #{workflowRunId}, #{status}, #{inputs}, #{outputs}, #{createdAt}, #{finishedAt}, #{elapsedTime}, #{error}, #{totalSteps}, #{totalTokens})
+        INSERT INTO dify_work_flow(`simpleUUID`, `difyTypeId`, `date`, `userId`, `workflowRunId`, `status`, `inputs`, `outputs`, `createdAt`, `finishedAt`, `elapsedTime`, `error`, `totalSteps`, `totalTokens`, `type`, `insertType`, `organizationId`)
+        VALUES (#{simpleUUID}, #{difyTypeId}, now(), #{userId}, #{workflowRunId}, #{status}, #{inputs}, #{outputs}, #{createdAt}, #{finishedAt}, #{elapsedTime}, #{error}, #{totalSteps}, #{totalTokens}, #{type}, #{insertType}, #{organizationId})
     </insert>
 
     <select id="getSimpleUUID" resultMap="result">
@@ -61,6 +64,15 @@
             <if test="status != null">
                 and status = #{status}
             </if>
+            <if test="type != 0">
+                and type = #{type}
+            </if>
+            <if test="insertType != 0">
+                and insertType = #{insertType}
+            </if>
+            <if test="organizationId != 0">
+                and organizationId = #{organizationId}
+            </if>
         </where>
     </select>