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

# Conflicts:
#	src/main/resources/application-testNetIn.yml

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

@@ -1,12 +1,14 @@
 package cn.cslg.pas.common.model.dify;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 
 @Data
 public class DifyFile {
     private String type;
-    @JsonProperty("transfer_method")
+//    @JsonProperty("transfer_method")
+    @SerializedName("transfer_method")
     private String transferMethod;
     private String url;
     @JsonProperty("upload_file_id")

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

@@ -0,0 +1,8 @@
+package cn.cslg.pas.common.model.dify;
+
+import lombok.Data;
+
+@Data
+public class GenerateClaimDTO {
+    private String claim;
+}

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

@@ -0,0 +1,19 @@
+package cn.cslg.pas.common.model.dify;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class OAMessageDTO {
+    @SerializedName("response_mode")
+    private String responseMode;
+    @JsonProperty("user")
+    private String user;
+
+    private Map<String,Object> inputs;
+    private List<DifyFile> files;
+}

src/main/java/cn/cslg/pas/common/model/dify/confessionSession/AddConfessionSessionFileDTO.java

@@ -0,0 +1,11 @@
+package cn.cslg.pas.common.model.dify.confessionSession;
+
+import lombok.Data;
+
+@Data
+public class AddConfessionSessionFileDTO {
+
+    private Integer confessionSessionId;
+
+    private String guid;
+}

src/main/java/cn/cslg/pas/common/model/dify/confessionSession/QueryAssoConfessionSessionFileDTO.java

@@ -0,0 +1,17 @@
+package cn.cslg.pas.common.model.dify.confessionSession;
+
+import cn.cslg.pas.common.model.cronModel.SystemFile;
+import lombok.Data;
+
+@Data
+public class QueryAssoConfessionSessionFileDTO {
+
+    private Integer assoConfessionSessionFileId;
+
+    private Integer confessionSessionId;
+
+    private String guid;
+
+    private SystemFile systemFile;
+
+}

src/main/java/cn/cslg/pas/common/model/dify/confessionSession/QueryConfessionSessionVO.java

@@ -15,4 +15,6 @@ public class QueryConfessionSessionVO {
     private String createId;
     private Date createTime;
     private String content;
+    private Integer type;
+    private SystemFile assoSystemFile;
 }

src/main/java/cn/cslg/pas/common/utils/DataUtils.java

@@ -243,6 +243,8 @@ public class DataUtils {
         }
         return result;
     }
+
+    //将Unicode代码转为字符
     public static String unicodeDecode(String string) {
         Pattern pattern = Pattern.compile("(\\\\u(\\p{XDigit}{4}))");
         Matcher matcher = pattern.matcher(string);

src/main/java/cn/cslg/pas/controller/common/AssoConfessionSessionFileController.java

@@ -0,0 +1,15 @@
+package cn.cslg.pas.controller.common;
+
+import cn.cslg.pas.common.core.base.Constants;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Tag(name = "外部人员调用接口")
+@RestController
+@RequestMapping(Constants.API_XiaoSHI + "/assoConfessionSessionFile")
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
+public class AssoConfessionSessionFileController {
+}

src/main/java/cn/cslg/pas/controller/common/ConfessionSessionController.java

@@ -78,4 +78,11 @@ public class ConfessionSessionController {
         return Response.success(id);
     }
 
+    @RequestMapping(value = "/addConfessionSessionFile", method = RequestMethod.POST)
+    @Operation(summary = "添加会话记录关联文件")
+    public Response addConfessionSessionFile(@RequestBody AddConfessionSessionFileDTO addConfessionSessionDTO) throws IOException {
+        Integer id = confessionSessionService.addConfessionSessionFile(addConfessionSessionDTO);
+        return Response.success(id);
+    }
+
 }

src/main/java/cn/cslg/pas/controller/outApi/DifyController.java

@@ -4,6 +4,8 @@ import cn.cslg.pas.common.core.base.Constants;
 import cn.cslg.pas.common.model.dify.ChatMessageDTO;
 import cn.cslg.pas.common.model.dify.DifyChatMessageDTO;
 import cn.cslg.pas.common.model.dify.DifyHistoryMessageDTO;
+import cn.cslg.pas.common.model.dify.OAMessageDTO;
+import cn.cslg.pas.common.model.dify.GenerateClaimDTO;
 import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.LoginUtils;
 import cn.cslg.pas.common.utils.Response;
@@ -52,7 +54,6 @@ public class DifyController {
     @Autowired
     private LoginUtils loginUtils;
 
-    //
     @RequestMapping(value = "/chatMessage", method = RequestMethod.POST, produces = MediaType.TEXT_EVENT_STREAM_VALUE)
     @Operation(summary = "发送对话")
     public Flux<String> chatMessage(@RequestBody ChatMessageDTO chatMessageDTO) throws IOException {
@@ -86,4 +87,16 @@ public class DifyController {
     public Response generateInventionPoint(@RequestBody ChatMessageDTO chatMessageDTO) throws IOException {
         return Response.success(difyService.generateInventionPoint(chatMessageDTO));
     }
+
+    @RequestMapping(value = "/generateClaimExplain", method = RequestMethod.POST)
+    @Operation(summary = "生成权利要求解释和有益效果")
+    public Response generateClaimExplain(@RequestBody GenerateClaimDTO generateClaimDTO) throws Exception {
+        return Response.success(difyService.generateClaimExplain(generateClaimDTO));
+    }
+
+    @RequestMapping(value = "/sendOADefense", method = RequestMethod.GET, produces = MediaType.TEXT_EVENT_STREAM_VALUE)
+    @Operation(summary = "OA答辩")
+    public Flux<String> sendOADefense(Integer confessionSessionId) throws IOException {
+        return difyService.successGetOAHttp(confessionSessionId);
+    }
 }

src/main/java/cn/cslg/pas/domain/dify/AssoConfessionSessionFile.java

@@ -0,0 +1,17 @@
+package cn.cslg.pas.domain.dify;
+
+import cn.cslg.pas.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@TableName(value = "asso_confession_session_file")
+@Data
+public class AssoConfessionSessionFile extends BaseEntity<AssoConfessionSessionFile> {
+
+    @TableField(value = "confession_session_id")
+    private Integer confessionSessionId;
+
+    @TableField(value = "guid")
+    private String guid;
+}

src/main/java/cn/cslg/pas/mapper/dify/AssoConfessionSessionFileMapper.java

@@ -0,0 +1,7 @@
+package cn.cslg.pas.mapper.dify;
+
+import cn.cslg.pas.domain.dify.AssoConfessionSessionFile;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface AssoConfessionSessionFileMapper extends BaseMapper<AssoConfessionSessionFile> {
+}

src/main/java/cn/cslg/pas/mapper/dify/ConfessionSessionMapper.java

@@ -2,6 +2,8 @@ package cn.cslg.pas.mapper.dify;
 
 import cn.cslg.pas.domain.dify.ConfessionSession;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 /**
 * @author admin
@@ -9,8 +11,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * @createDate 2025-04-16 15:48:57
 * @Entity cn.cslg.pas.domain.novelty.domain.ConfessionSession
 */
+@Repository
 public interface ConfessionSessionMapper extends BaseMapper<ConfessionSession> {
 
+    public int updateSingleField(@Param("id") Integer id, @Param("field") String field,
+                                 @Param("value") Object value);
 }
 
 

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

@@ -1,23 +1,27 @@
 package cn.cslg.pas.service.common;
 
 
-import cn.cslg.pas.common.model.dify.ChatMessageDTO;
-import cn.cslg.pas.common.model.dify.DifyChatMessageDTO;
-import cn.cslg.pas.common.model.dify.DifyHistoryMessageDTO;
+import cn.cslg.pas.common.model.dify.*;
 
+import cn.cslg.pas.common.model.dify.GenerateClaimDTO;
+import cn.cslg.pas.common.model.dify.confessionSession.AddConfessionSessionDTO;
 import cn.cslg.pas.common.model.dify.confessionSession.UpdateConfessionSessionDTO;
 import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.DataUtils;
+import cn.cslg.pas.common.utils.DateUtils;
 import cn.cslg.pas.common.utils.LoginUtils;
 import cn.cslg.pas.domain.business.TechnicalCase;
 import cn.cslg.pas.domain.dify.ConfessionSession;
 import cn.cslg.pas.domain.report.AssoProjectConfession;
+import cn.cslg.pas.mapper.dify.ConfessionSessionMapper;
 import cn.cslg.pas.service.business.TechnicalCaseService;
 import cn.cslg.pas.service.dify.ConfessionSessionService;
 import cn.cslg.pas.service.dify.DifySessionService;
 import cn.cslg.pas.service.report.AssoProjectConfessionService;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
@@ -25,20 +29,21 @@ import com.google.gson.GsonBuilder;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.*;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.w3c.dom.DocumentType;
 import reactor.core.publisher.Flux;
 
+import javax.swing.text.Document;
 import java.io.*;
 
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 
@@ -54,10 +59,14 @@ import java.util.concurrent.TimeUnit;
 public class DifyService {
     @Value("${DIFY.apiKey}")
     private String apiKey;
+    @Value("${DIFY.OAApiKey}")
+    private String OAApiKey;
     @Value("${DIFY.url}")
     private String url;
     @Value("${FileDownloadUrl}")
     private String fileDownloadUrl;
+    @Value("${DIFY.cliamKey}")
+    private String cliamKey;
     private final DifySessionService difySessionService;
     private final TechnicalCaseService technicalCaseService;
     private final AssoProjectConfessionService assoProjectConfessionService;
@@ -66,6 +75,8 @@ public class DifyService {
     @Autowired
     private LoginUtils loginUtils;
     private final ConfessionSessionService confessionSessionService;
+    @Autowired
+    private ConfessionSessionMapper confessionSessionMapper;
 
     /**
      * 调用文件系统删除文件接口
@@ -136,7 +147,7 @@ public class DifyService {
             inventionPoint = this.getInventPoint(projectId);
         } else if (confessionSessionId != null) {
             ConfessionSession confessionSession = confessionSessionService.getById(confessionSessionId);
-            fileContent = fileDownloadUrl +confessionSession.getGuid();
+            fileContent = fileDownloadUrl + confessionSession.getGuid();
             inventionPoint = confessionSession.getInventionPoint();
         }
 
@@ -268,14 +279,13 @@ public class DifyService {
         String conversationId = chatMessageDTO.getConversationId();
         DifyChatMessageDTO difyChatMessageDTO = new DifyChatMessageDTO();
         Map<String, Object> map = new HashMap<>();
-        String fileContent="";
-         if(confessionSessionId!=null){
-             ConfessionSession confessionSession=confessionSessionService.getById(confessionSessionId);
-             fileContent=fileDownloadUrl+confessionSession.getGuid();
-         }
-         else if(projectId!=null) {
-             fileContent = this.getConfression(projectId);
-         }
+        String fileContent = "";
+        if (confessionSessionId != null) {
+            ConfessionSession confessionSession = confessionSessionService.getById(confessionSessionId);
+            fileContent = fileDownloadUrl + confessionSession.getGuid();
+        } else if (projectId != null) {
+            fileContent = this.getConfression(projectId);
+        }
         map.put("file_path", fileContent);
         difyChatMessageDTO.setInputs(map);
         difyChatMessageDTO.setConversationId(conversationId);
@@ -311,8 +321,156 @@ public class DifyService {
         }
         map1.put("conversation_id", conversationId);
 
-        map1.put("projectId",projectId);
-        map1.put("confessionSessionId",confessionSessionId);
+        map1.put("projectId", projectId);
+        map1.put("confessionSessionId", confessionSessionId);
         return map1;
     }
+
+    public List<Object> generateClaimExplain(GenerateClaimDTO generateClaimDTO) throws Exception {
+        String claim = generateClaimDTO.getClaim();
+        DifyChatMessageDTO difyChatMessageDTO = new DifyChatMessageDTO();
+        String userId = loginUtils.getId().toString();
+        Map<String, Object> map = new HashMap<>();
+        map.put("claim", claim);
+        difyChatMessageDTO.setInputs(map);
+        difyChatMessageDTO.setResponseMode("blocking");
+        difyChatMessageDTO.setUser(userId);
+
+        String param = new Gson().toJson(difyChatMessageDTO);
+        RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);
+        OkHttpClient okHttpClient = new OkHttpClient.Builder()
+                .connectTimeout(6000, TimeUnit.SECONDS)
+                .writeTimeout(6000, TimeUnit.SECONDS)
+                .readTimeout(6000, TimeUnit.SECONDS)
+                .build();
+        Request request = new Request.Builder()
+                .url(url + "workflows/run")
+                .post(requestBody)
+                .addHeader("Authorization", "Bearer " + cliamKey)
+                .build();
+        String res = Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
+        JSONObject jsonObject = JSONObject.parseObject(res);
+        String dataStr = jsonObject.get("data").toString();
+        JSONObject dataObject = JSONObject.parseObject(dataStr);
+        String outPuts = dataObject.get("outputs").toString();
+        JSONObject jsonObject1 = JSONObject.parseObject(outPuts);
+        Object retsObj= jsonObject1.get("json");
+        String rets = retsObj.toString();
+        List<Object> reObject = JSONArray.parseArray(rets, Object.class);
+        Map<String, Object> addMap = new HashMap<>();
+        Map<String,Object> queryMap =new HashMap<>();
+        queryMap.put("claim",claim);
+        addMap.put("query", queryMap);
+        addMap.put("answer", retsObj);
+        String addStr = JSONObject.toJSONString(addMap);
+        AddConfessionSessionDTO addConfessionSessionDTO = new AddConfessionSessionDTO();
+        addConfessionSessionDTO.setConversationId(jsonObject.get("workflow_run_id").toString());
+        addConfessionSessionDTO.setContent(addStr);
+        String name = DateUtils.dateTimeToStr(new Date());
+        name = name + "-权利要求解释及有益效果";
+        addConfessionSessionDTO.setConversationName(name);
+        addConfessionSessionDTO.setType(1);
+        confessionSessionService.addSession(addConfessionSessionDTO);
+        System.out.println(res);
+        return reObject;
+    }
+
+
+    public Flux<String> successGetOAHttp(Integer confessionSessionId) {
+        ConfessionSession confessionSession = confessionSessionService.getById(confessionSessionId);
+        String fileUrl = fileDownloadUrl + confessionSession.getGuid();
+        String userId = loginUtils.getId().toString();
+
+        OkHttpClient client = new OkHttpClient.Builder()
+                .connectTimeout(600, TimeUnit.SECONDS)
+                .writeTimeout(600, TimeUnit.SECONDS)
+                .readTimeout(600, TimeUnit.SECONDS)
+                .build();
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("fileUrl", fileUrl);
+
+        OAMessageDTO oaMessageDTO = new OAMessageDTO();
+        oaMessageDTO.setInputs(map);
+        oaMessageDTO.setResponseMode("streaming");
+        oaMessageDTO.setUser(userId);
+        oaMessageDTO.setFiles(new ArrayList<>());
+
+        String param = new Gson().toJson(oaMessageDTO);
+        RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);
+        Request request = new Request.Builder()
+                .url(url + "workflows/run")
+                .addHeader("Authorization", "Bearer " + OAApiKey)
+                .addHeader(HttpHeaders.CONTENT_TYPE, "application/json")
+                .post(requestBody)
+                .build();
+        return Flux.create(emitter -> {
+            client.newCall(request).enqueue(new Callback() {
+                @Override
+                public void onFailure(Call call, IOException e) {
+                    emitter.error(e);
+                }
+
+                @Override
+                public void onResponse(Call call, Response response) throws IOException {
+
+                    if (!response.isSuccessful()) {
+                        emitter.error(new IOException("Unexpected code: " + response));
+                        return;
+                    }
+
+                    try (Reader reader = response.body().charStream()) {
+                        BufferedReader bufferedReader = new BufferedReader(reader);
+                        String line;
+                        String prefixToRemove = "data: ";
+                        String runId = "";
+                        while ((line = bufferedReader.readLine()) != null) {
+                            if (line.isEmpty()) {
+                                continue;
+                            }
+                            if (line.startsWith(prefixToRemove)) {
+                                line = line.substring(prefixToRemove.length());
+                            }
+                            try {
+                                JSONObject jsonObject = JSON.parseObject(line);
+                                String workflowRunId = jsonObject.get("workflow_run_id").toString();
+                                String event = jsonObject.get("event").toString();
+                                if (StringUtils.isNotEmpty(workflowRunId)) {
+                                    if (StringUtils.isEmpty(runId)) {
+                                        runId = workflowRunId;
+                                        confessionSessionMapper.updateSingleField(confessionSessionId, "conversation_id", workflowRunId);
+
+                                    }
+                                }
+                                if (event.equals("workflow_finished")) {
+                                    String data = jsonObject.get("data").toString();
+                                    String content = "";
+                                    if (StringUtils.isNotEmpty(data)) {
+                                        JSONObject dataObject = JSON.parseObject(data);
+                                        String outputs = dataObject.get("outputs").toString();
+                                        if (StringUtils.isNotEmpty(outputs)) {
+                                            JSONObject outputsObject = JSON.parseObject(outputs);
+                                            String output = outputsObject.get("output").toString();
+                                            content = DataUtils.unicodeDecode(output);
+                                        }
+                                    }
+                                    if (StringUtils.isNotEmpty(content)) {
+                                        JSONObject obj = new JSONObject();
+                                        obj.put("answer", content);
+                                        confessionSessionMapper.updateSingleField(confessionSessionId, "content", obj.toString());
+                                    }
+                                }
+                            } catch (Exception e) {
+                            }
+                            emitter.next(line); // 将每行数据发送到 Flux
+                        }
+                    } catch (IOException e) {
+                        emitter.error(e);
+                    } finally {
+                        emitter.complete();
+                    }
+                }
+            });
+        });
+    }
 }

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

@@ -0,0 +1,12 @@
+package cn.cslg.pas.service.dify;
+
+import cn.cslg.pas.domain.dify.AssoConfessionSessionFile;
+import cn.cslg.pas.mapper.dify.AssoConfessionSessionFileMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class AssoConfessionSessionFileService extends ServiceImpl<AssoConfessionSessionFileMapper, AssoConfessionSessionFile> {
+}

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

@@ -5,8 +5,10 @@ import cn.cslg.pas.common.model.dify.confessionSession.*;
 import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.FormatUtil;
 import cn.cslg.pas.common.utils.LoginUtils;
+import cn.cslg.pas.domain.dify.AssoConfessionSessionFile;
 import cn.cslg.pas.exception.ExceptionEnum;
 import cn.cslg.pas.exception.XiaoShiException;
+import cn.cslg.pas.mapper.dify.AssoConfessionSessionFileMapper;
 import cn.cslg.pas.service.common.FileManagerService;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -14,9 +16,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.cslg.pas.domain.dify.ConfessionSession;
 import cn.cslg.pas.mapper.dify.ConfessionSessionMapper;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -34,16 +39,19 @@ public class ConfessionSessionService extends ServiceImpl<ConfessionSessionMappe
     private final CacheUtils cacheUtils;
     private final LoginUtils loginUtils;
     private final FileManagerService fileManagerService;
+    private final AssoConfessionSessionFileMapper assoConfessionSessionFileMapper;
 
     public Integer addConfessionSession(AddConfessionSessionDTO addConfessionSessionDTO) {
         String guid = addConfessionSessionDTO.getFileGuid();
         String name = "";
         try {
-            String res = fileManagerService.getSystemFileFromFMS(Arrays.asList(guid));
-            List<SystemFile> systemFiles = JSONObject.parseArray(res, SystemFile.class);
-            if (systemFiles != null && !systemFiles.isEmpty()) {
-                SystemFile systemFile = systemFiles.get(0);
-                name = systemFile.getOriginalName();
+            if (guid != null && !guid.trim().equals("")) {
+                String res = fileManagerService.getSystemFileFromFMS(Arrays.asList(guid));
+                List<SystemFile> systemFiles = JSONObject.parseArray(res, SystemFile.class);
+                if (systemFiles != null && !systemFiles.isEmpty()) {
+                    SystemFile systemFile = systemFiles.get(0);
+                    name = systemFile.getOriginalName();
+                }
             }
         } catch (Exception e) {
         }
@@ -55,6 +63,7 @@ public class ConfessionSessionService extends ServiceImpl<ConfessionSessionMappe
         confessionSession.setConversationName(name);
         String id = loginUtils.getId().toString();
         confessionSession.setCreateId(id);
+        confessionSession.setType(addConfessionSessionDTO.getType());
         confessionSession.insert();
         return confessionSession.getId();
     }
@@ -88,29 +97,73 @@ public class ConfessionSessionService extends ServiceImpl<ConfessionSessionMappe
         if (confessionSessions == null || confessionSessions.size() == 0) {
             return queryConfessionSessionVOS;
         }
-        List<String> fileGuids = confessionSessions.stream().filter(item->item.getGuid()!=null).map(ConfessionSession::getGuid).collect(Collectors.toList());
+        List<String> fileGuids = confessionSessions.stream().filter(item -> item.getGuid() != null).map(ConfessionSession::getGuid).collect(Collectors.toList());
         List<SystemFile> systemFiles = new ArrayList<>();
         try {
-            if (fileGuids != null&&fileGuids.size()>0) {
+            if (fileGuids != null && fileGuids.size() > 0) {
                 String res = fileManagerService.getSystemFileFromFMS(fileGuids);
-            systemFiles = JSONObject.parseArray(res, SystemFile.class);
+                systemFiles = JSONObject.parseArray(res, SystemFile.class);
             }
         } catch (Exception e) {
             e.printStackTrace();
         }
+
+        List<Integer> confessionSessionIds = confessionSessions.stream().map(ConfessionSession::getId).collect(Collectors.toList());
+        List<QueryAssoConfessionSessionFileDTO> sessionFileDTOS = this.queryAssoConfessionSessionFileDTOS(confessionSessionIds);
+
         for (ConfessionSession confessionSession : confessionSessions) {
             QueryConfessionSessionVO queryConfessionSessionVO = new QueryConfessionSessionVO();
             BeanUtils.copyProperties(confessionSession, queryConfessionSessionVO);
             String guid = confessionSession.getGuid();
-            if(systemFiles!=null) {
+            if (systemFiles != null) {
                 SystemFile systemFile = systemFiles.stream().filter(item -> item.getGuid().equals(guid)).findFirst().orElse(null);
                 queryConfessionSessionVO.setSystemFile(systemFile);
             }
+            if (!CollectionUtils.isEmpty(sessionFileDTOS)) {
+                QueryAssoConfessionSessionFileDTO fileDTO = sessionFileDTOS.stream().filter(i -> i.getConfessionSessionId().equals(confessionSession.getId())).findFirst().orElse(null);
+                if (fileDTO != null) {
+                    queryConfessionSessionVO.setAssoSystemFile(fileDTO.getSystemFile());
+                }
+            }
             queryConfessionSessionVOS.add(queryConfessionSessionVO);
         }
         return queryConfessionSessionVOS;
     }
 
+    public List<QueryAssoConfessionSessionFileDTO> queryAssoConfessionSessionFileDTOS(List<Integer> list) {
+        //装载会话关联文件信息
+        List<QueryAssoConfessionSessionFileDTO> assoConfessionSessionFileDTOS = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(list)) {
+            List<AssoConfessionSessionFile> assoConfessionSessionFiles = assoConfessionSessionFileMapper.selectList(new LambdaQueryWrapper<AssoConfessionSessionFile>()
+                    .in(AssoConfessionSessionFile::getConfessionSessionId, list));
+            if (!CollectionUtils.isEmpty(assoConfessionSessionFiles)) {
+                List<String> fileGuids = assoConfessionSessionFiles.stream().map(AssoConfessionSessionFile::getGuid)
+                        .filter(StringUtils::isNotEmpty).collect(Collectors.toList());
+                List<SystemFile> systemFiles = new ArrayList<>();
+                try {
+                    if (!CollectionUtils.isEmpty(fileGuids)) {
+                        String res = fileManagerService.getSystemFileFromFMS(fileGuids);
+                        systemFiles = JSONObject.parseArray(res, SystemFile.class);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
+                for (AssoConfessionSessionFile sessionFile : assoConfessionSessionFiles) {
+                    QueryAssoConfessionSessionFileDTO fileDTO = new QueryAssoConfessionSessionFileDTO();
+                    BeanUtils.copyProperties(sessionFile, fileDTO);
+                    fileDTO.setAssoConfessionSessionFileId(sessionFile.getId());
+                    if (!CollectionUtils.isEmpty(systemFiles)) {
+                        SystemFile systemFile = systemFiles.stream().filter(item -> item.getGuid().equals(sessionFile.getGuid())).findFirst().orElse(null);
+                        fileDTO.setSystemFile(systemFile);
+                    }
+                    assoConfessionSessionFileDTOS.add(fileDTO);
+                }
+            }
+        }
+        return assoConfessionSessionFileDTOS;
+    }
+
     public List<Integer> deleteConfessionSessions(DeleteConfessionSessionDTO deleteConfessionSessionDTO) {
         List<Integer> ids = deleteConfessionSessionDTO.getConfessionSessionIds();
         this.removeBatchByIds(ids);
@@ -128,6 +181,14 @@ public class ConfessionSessionService extends ServiceImpl<ConfessionSessionMappe
         confessionSession.insert();
         return confessionSession.getId();
     }
+
+    public Integer addConfessionSessionFile(AddConfessionSessionFileDTO addConfessionSessionFileDTO) {
+        AssoConfessionSessionFile assoConfessionSessionFile = new AssoConfessionSessionFile();
+        assoConfessionSessionFile.setConfessionSessionId(addConfessionSessionFileDTO.getConfessionSessionId());
+        assoConfessionSessionFile.setGuid(addConfessionSessionFileDTO.getGuid());
+        assoConfessionSessionFile.insert();
+        return assoConfessionSessionFile.getId();
+    }
 }
 
 

src/main/resources/application-dev.yml

@@ -87,4 +87,6 @@ management:
       show-details: always
 DIFY:
   apiKey: app-DDGJt4QUmzlc2aFQ5voOAXIj
+  cliamKey: app-fxpiWOYqtJM1BOaJnG54NlCZ
+  OAApiKey: app-mmfvVywt7wdS8HofrYpFy4RL
   url: http://192.168.2.24/v1/

src/main/resources/application-testNetIn.yml

@@ -80,4 +80,5 @@ WDSYS:
   password: Lqftiu807005
 DIFY:
   apiKey: app-DDGJt4QUmzlc2aFQ5voOAXIj
-  url: https://ai.xsip.cn/v1/
+  OAApiKey: app-mmfvVywt7wdS8HofrYpFy4RL
+  url: https://ai.xsip.cn/v1/

src/main/resources/mapper/ConfessionSessionMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="cn.cslg.pas.mapper.dify.ConfessionSessionMapper">
+
+    <update id="updateSingleField">
+        UPDATE confession_session
+        <set>
+            ${field} = #{value}
+        </set>
+        WHERE id = #{id}
+    </update>
+
+</mapper>

src/test/java/cn/cslg/pas/service/EventServiceTests.java

@@ -25,6 +25,7 @@ import cn.cslg.pas.domain.es.PatentPerson;
 import cn.cslg.pas.exception.ExceptionEnum;
 import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.mapper.AssoProjectEventMapper;
+import cn.cslg.pas.mapper.dify.ConfessionSessionMapper;
 import cn.cslg.pas.service.business.*;
 import cn.cslg.pas.service.business.es.*;
 import cn.cslg.pas.service.common.FileManagerService;
@@ -930,4 +931,24 @@ public class EventServiceTests {
         GenerateObjectUtil.getTableColumnName(project,"evidenceRiskResponse");
     }
 
+    @Autowired
+    private ConfessionSessionMapper sessionMapper;
+
+    @Test
+    public void test121() throws Exception {
+//        String s = "<details style=\\\"color:gray;background-color: #f8f8f8;padding: 8px;border-radius: 4px;\\\" open> <summary> Thinking... </summary>\\u55ef\\uff0c\\u7528\\u6237\\u7ed9\\u4e86\\u4e00\\u4e2a\\u5173\\u4e8e\\u4e13\\u5229\\u5ba1\\u67e5\\u610f\\u89c1\\u7b54\\u590d\\u7684\\u590d\\u6742\\u95ee\\u9898\\uff0c\\u9700\\u8981";
+//        final String unicodeDecode = DataUtils.unicodeDecode(s);
+//        System.out.println(unicodeDecode);
+//
+//
+//        JSONObject obj = new JSONObject();
+//        obj.put("answer", unicodeDecode);
+//        final String s1 = obj.toJSONString();
+//        final String s2 = obj.toString();
+//        System.out.println(s1);
+//        System.out.println(s2);
+        final int i = sessionMapper.updateSingleField(78, "content", "1222");
+        System.out.println(i);
+
+    }
 }