Merge remote-tracking branch 'origin/master' into prod_test

src/main/java/cn/cslg/pas/common/model/dify/OAParamDTO.java

@@ -10,4 +10,6 @@ public class OAParamDTO {
 
     @SerializedName("patent_fileUrls")
     private String patentFileUrls;
+    private String appFileGuid;
+    private String modifyFileGuid;
 }

src/main/java/cn/cslg/pas/service/common/DifyService.java

@@ -505,6 +505,8 @@ public class DifyService {
     public Flux<String> successGetOAHttp1(OAParamDTO vo) {
         Integer confessionSessionId = vo.getConfessionSessionId();
         String patentFileUrls = vo.getPatentFileUrls();
+        String appFileGuid = vo.getAppFileGuid();
+        String modifyFileGuid = vo.getModifyFileGuid();
         ConfessionSession confessionSession = confessionSessionService.getById(confessionSessionId);
         if (ObjectUtils.isEmpty(confessionSession)) {
             throw new XiaoShiException(ExceptionEnum.BUSINESS_ERROR, "未查询到OA答辩记录");
@@ -524,6 +526,9 @@ public class DifyService {
         Map<String, Object> map = new HashMap<>();
         map.put("fileUrl", fileUrl);
         map.put("patent_fileUrls",patentFileUrls);
+        map.put("app_file_guid",appFileGuid);
+        map.put("modify_file_guid",modifyFileGuid);
+        map.put("patent_files", new ArrayList<>());
 
         OAMessageDTO oaMessageDTO = new OAMessageDTO();
         oaMessageDTO.setInputs(map);

src/main/java/cn/cslg/pas/service/dify/GenerateInstructionService.java

@@ -407,12 +407,13 @@ public class GenerateInstructionService {
 
             contents.add(tem);
         }
-        if (effect != null && !effect.trim().equals("")) {
-            contents.add(effect);
-        }
         if (explain != null && !explain.trim().equals("")) {
             contents.add(explain);
         }
+        if (effect != null && !effect.trim().equals("")) {
+            contents.add(effect);
+        }
+
 
         return contents;
     }