Merge branch 'release_gdghg' of ssh://gitlab.gsstcloud.com:10022/poc/poc-api into release_gdghg

src/main/java/cn/com/poc/ai_bi/aggregate/impl/AiBiServiceImpl.java

@@ -286,26 +286,8 @@ public class AiBiServiceImpl implements AiBiService {
                     echartJSONObject.put("sql_result", dbChainResult.getSqlResult());
                     echartJSONObject.put("question", input);
                     AbstractFunctionResult<String> functionResult = eChartGenerateFunction.doFunction(echartJSONObject.toJSONString(), null, null, null);
-                    //输出EChart
-                    if (functionResult != null && StringUtils.isNotBlank(functionResult.getFunctionResult())) {
-                        JSONObject jsonObject = JSONObject.parseObject(functionResult.getFunctionResult());
-                        if (!jsonObject.containsKey("skip")) {
-                            ToolFunction toolFunction = new ToolFunction();
-                            toolFunction.setName("echart_function");
-                            toolFunction.setResult(functionResult.getFunctionResult());
-                            toolFunction.setDisplayFormat("json");
-                            toolFunction.setArguments(null);
-                            result = new LargeModelDemandResult();
-                            result.setCode("0");
-                            result.setFunction(toolFunction);
-                            result.setDbChainResult(null);
-                            result.setKnowledgeContentResult(null);
-
-                            String toolFunctionJson = JsonUtils.serialize(result);
-                            sseUtil.send(toolFunctionJson);
-                            functionRecord = toolFunctionJson;
-                        }
-                    }
+                    String eChartOption = functionResult.getFunctionResult();
+                    functionRecord = outputECharts(eChartOption, sseUtil, functionRecord);
                 }
             } else if (StringUtils.isNotBlank(fileUrl)) {
                 CSVChainResponse csvChainResponse = new CSVChainResponse();
@@ -313,12 +295,20 @@ public class AiBiServiceImpl implements AiBiService {
                 csvChainResponse.setContext(null);
                 csvChainResponse.setFilePath(fileUrl);
                 csvChainResult = chainService.csvChain(csvChainResponse);
+
+
                 if (csvChainResult != null) {
-                    String[] csvRes = JsonUtils.deSerialize(csvChainResult.getResult(), String[].class);
-                    if (ArrayUtils.isNotEmpty(csvRes)) {
+                    LargeModelDemandResult result = new LargeModelDemandResult();
+                    result.setCode("0");
+                    result.setFunction(null);
+                    result.setDbChainResult(null);
+                    result.setKnowledgeContentResult(null);
+                    result.setCsvChainResult(csvChainResult);
+                    sseUtil.send(JsonUtils.serialize(result));
+                    if (StringUtils.isNotBlank(csvChainResult.getResult())) {
                         JSONObject echartJSONObject = new JSONObject();
-                        echartJSONObject.put("sql", null);
-                        echartJSONObject.put("sql_result", csvRes.toString());
+                        echartJSONObject.put("sql", StringUtils.EMPTY);
+                        echartJSONObject.put("sql_result", csvChainResult.getResult());
                         echartJSONObject.put("question", input);
                         AbstractFunctionResult<String> functionResult = eChartGenerateFunction.doFunction(echartJSONObject.toJSONString(), null, null, null);
                         String eChartOption = functionResult.getFunctionResult();
@@ -367,9 +357,9 @@ public class AiBiServiceImpl implements AiBiService {
 
     }
 
-        private String outputECharts(String eChartOption, SSEUtil sseUtil, String functionRecord) throws IOException {
+    private String outputECharts(String eChartOption, SSEUtil sseUtil, String functionRecord) throws IOException {
         //输出EChart
-        if (eChartOption != null) {
+        if (eChartOption != null && StringUtils.isNotBlank(eChartOption)) {
             JSONObject jsonObject = JSONObject.parseObject(eChartOption);
             if (!jsonObject.containsKey("skip")) {
                 ToolFunction toolFunction = new ToolFunction();

src/main/java/cn/com/poc/ai_dialogues/aggregate/impl/AiDialoguesServiceImpl.java

 package cn.com.poc.ai_dialogues.aggregate.impl;
 
+import cn.com.poc.agent_application.aggregate.AgentApplicationService;
 import cn.com.poc.agent_application.entity.BizAgentApplicationGcConfigEntity;
 import cn.com.poc.agent_application.query.AgentApplicationDialoguesRecordQueryItem;
 import cn.com.poc.agent_application.service.BizAgentApplicationDialoguesRecordService;
@@ -16,7 +17,9 @@ import cn.com.poc.ai_dialogues.service.BizAiDialoguesGuessYouAskService;
 import cn.com.poc.ai_dialogues.service.BizAiDialoguesProblemAssociationService;
 import cn.com.poc.ai_dialogues.service.BizAiDialoguesService;
 import cn.com.poc.common.constant.CommonConstant;
+import cn.com.poc.common.constant.XLangConstant;
 import cn.com.poc.common.service.BizFileUploadRecordService;
+import cn.com.poc.common.service.RedisService;
 import cn.com.poc.common.utils.JsonUtils;
 import cn.com.poc.common.utils.StringUtils;
 import cn.com.poc.expose.dto.DialoguesContextDto;
@@ -34,10 +37,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
+import java.security.SecureRandom;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -70,6 +71,9 @@ public class AiDialoguesServiceImpl implements AiDialoguesService {
     @Resource
     private BizAgentApplicationGcConfigService bizAgentApplicationGcConfigService;
 
+    @Resource
+    private RedisService redisService;
+
     @Override
     public String create(AiDialoguesTypeEnum type, Long userId) throws Exception {
         return bizAiDialoguesService.create(type.getType(), userId);
@@ -232,15 +236,33 @@ public class AiDialoguesServiceImpl implements AiDialoguesService {
 
     @Override
     public List<String> guessYouAsk(String type) throws Exception {
-        List<BizAiDialoguesGuessYouAskEntity> entities = bizAiDialoguesGuessYouAskService.findByExample(new BizAiDialoguesGuessYouAskEntity(), null);
-        // 新增随机逻辑
-        if (CollectionUtils.isNotEmpty(entities)) {
-            Collections.shuffle(entities); // 打乱顺序
-            return entities.stream()
-                    .limit(8) // 取前八个
-                    .map(BizAiDialoguesGuessYouAskEntity::getQuestion)
-                    .collect(Collectors.toList());
+        //
+        String redisKey = "AGENT_APPLICATION_RECOMMEND_QUESTIONS:" + XLangConstant.ZH_CN;
+
+        long size = redisService.lGetListSize(redisKey);
+        if (size < 8) {
+            redisService.del(redisKey);
+            return Collections.emptyList();
         }
-        return Collections.emptyList();
+
+        List<Object> lastRecomendIdSet = null;
+        Set<Long> indexSet = new HashSet<>(8);
+        SecureRandom secureRandom = new SecureRandom();
+
+        do {
+            long id = secureRandom.nextInt((int) size);
+            if (CollectionUtils.isNotEmpty(lastRecomendIdSet) && lastRecomendIdSet.stream().anyMatch(v -> String.valueOf(v).equals(String.valueOf(id)))) {
+                continue;
+            }
+            indexSet.add(id);
+        } while (indexSet.size() < 8);
+
+        List<String> result = new ArrayList<>(8);
+        for (Long index : indexSet) {
+            Object str = redisService.lGetIndex(redisKey, index);
+            result.add(str.toString());
+        }
+
+        return result;
     }
 }

src/main/java/cn/com/poc/knowledge/convert/BizKnowledgeDatabaseConvert.java

@@ -85,6 +85,7 @@ public class BizKnowledgeDatabaseConvert {
         BizKnowledgeDatabaseDto bizKnowledgeDatabaseDto = new BizKnowledgeDatabaseDto();
         bizKnowledgeDatabaseDto.setId(item.getId());
         bizKnowledgeDatabaseDto.setMemberId(item.getMemberId());
+        bizKnowledgeDatabaseDto.setExample(item.getMemberId() == 0);
         bizKnowledgeDatabaseDto.setTitle(item.getTitle());
         bizKnowledgeDatabaseDto.setDesc(item.getDbDesc());
         bizKnowledgeDatabaseDto.setDbType(item.getDbType());

src/main/java/cn/com/poc/knowledge/dto/BizKnowledgeDatabaseDto.java

@@ -23,6 +23,19 @@ public class BizKnowledgeDatabaseDto {
         this.id = id;
     }
 
+    /**
+     * 是否为示例  true-示例 ,false-非示例
+     */
+    private boolean example;
+
+    public boolean getExample() {
+        return example;
+    }
+
+    public void setExample(boolean example) {
+        this.example = example;
+    }
+
     /**
      * member_id
      * 用户ID

src/main/java/cn/com/poc/knowledge/query/KnowledgeDatabaseQueryInfoQuery.sql

-SELECT id, member_id, title, db_desc, db_type, db_host, db_port, db_name, db_username, db_password, is_deleted, CREATOR, CREATED_TIME, MODIFIER, MODIFIED_TIME, SYS_VERSION FROM biz_knowledge_database
-where is_deleted = 'N' 
-<<and member_id = :memberId>>
+SELECT id,
+       member_id,
+       title,
+       db_desc,
+       db_type,
+       db_host,
+       db_port,
+       db_name,
+       db_username,
+       db_password,
+       is_deleted,
+       CREATOR,
+       CREATED_TIME,
+       MODIFIER,
+       MODIFIED_TIME,
+       SYS_VERSION
+FROM biz_knowledge_database
+where is_deleted = 'N' and (member_id = 0 <<or member_id = :memberId>>)
 <<and LOCATE(:search ,title)>>
-order by MODIFIED_TIME desc
+order by member_id, MODIFIED_TIME desc
\ No newline at end of file

src/main/java/cn/com/poc/knowledge/rest/impl/DatabaseRestImpl.java

@@ -80,7 +80,7 @@ public class DatabaseRestImpl implements DatabaseRest {
         Long userId = userBaseEntity.getUserId();
 
         BizKnowledgeDatabaseEntity bizKnowledgeDatabaseEntity = bizKnowledgeDatabaseService.get(id.longValue());
-        if (bizKnowledgeDatabaseEntity == null || !bizKnowledgeDatabaseEntity.getMemberId().equals(userId.intValue())) {
+        if (bizKnowledgeDatabaseEntity == null || (!bizKnowledgeDatabaseEntity.getMemberId().equals(0) && !bizKnowledgeDatabaseEntity.getMemberId().equals(userId.intValue()))) {
             throw new BusinessException("no database found");
         }
         BizKnowledgeDatabaseDto bizKnowledgeDatabaseDto = BizKnowledgeDatabaseConvert.entityToDto(bizKnowledgeDatabaseEntity);
@@ -108,7 +108,8 @@ public class DatabaseRestImpl implements DatabaseRest {
         List<BizKnowledgeDatabaseDto> result = new ArrayList<>();
         for (Integer id : ids) {
             BizKnowledgeDatabaseEntity bizKnowledgeDatabaseEntity = bizKnowledgeDatabaseService.get(id.longValue());
-            if (bizKnowledgeDatabaseEntity == null || !bizKnowledgeDatabaseEntity.getMemberId().equals(userId.intValue())) {
+            if (bizKnowledgeDatabaseEntity == null || (!bizKnowledgeDatabaseEntity.getMemberId().equals(0)
+                    && !bizKnowledgeDatabaseEntity.getMemberId().equals(userId.intValue()))) {
                 continue;
             }
             BizKnowledgeDatabaseDto bizKnowledgeDatabaseDto = BizKnowledgeDatabaseConvert.entityToDto(bizKnowledgeDatabaseEntity);
@@ -235,13 +236,13 @@ public class DatabaseRestImpl implements DatabaseRest {
     }
 
     @Override
-    public DatabaseTableDataDto getTableData( DatabaseTableDataResponseDto dto, PagingInfo pagingInfo) {
+    public DatabaseTableDataDto getTableData(DatabaseTableDataResponseDto dto, PagingInfo pagingInfo) {
         Assert.notNull(dto.getId(), "id can not be null");
         Assert.notNull(dto.getTable(), "table can not be null");
         UserBaseEntity userBaseEntity = BlContext.getCurrentUserNotException();
         Long userId = userBaseEntity.getUserId();
         BizKnowledgeDatabaseEntity bizKnowledgeDatabaseEntity = bizKnowledgeDatabaseService.get(dto.getId().longValue());
-        if (bizKnowledgeDatabaseEntity == null || !bizKnowledgeDatabaseEntity.getMemberId().equals(userId.intValue())) {
+        if (bizKnowledgeDatabaseEntity == null || (!bizKnowledgeDatabaseEntity.getMemberId().equals(0) && !bizKnowledgeDatabaseEntity.getMemberId().equals(userId.intValue()))) {
             throw new BusinessException("no database found");
         }
 

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/largemodel/LargeModelDemandResult.java

 package cn.com.poc.thirdparty.resource.demand.ai.entity.largemodel;
 
 import cn.com.poc.agent_application.entity.KnowledgeContentResult;
+import cn.com.poc.thirdparty.resource.demand.ai.entity.csvchain.CSVChainResult;
 import cn.com.poc.thirdparty.resource.demand.ai.entity.dbchain.DBChainResult;
 import cn.com.poc.thirdparty.resource.demand.ai.entity.dialogue.ToolFunction;
 import cn.com.poc.thirdparty.resource.demand.ai.entity.dialogue.Usage;
@@ -19,6 +20,8 @@ public class LargeModelDemandResult extends AbstractResult implements Serializab
 
     private ToolFunction function;
 
+    private CSVChainResult csvChainResult;
+
     private List<DBChainResult> dbChainResult;
 
     private List<KnowledgeContentResult> knowledgeContentResult;
@@ -43,6 +46,14 @@ public class LargeModelDemandResult extends AbstractResult implements Serializab
         this.knowledgeContentResult = knowledgeContentResult;
     }
 
+    public CSVChainResult getCsvChainResult() {
+        return csvChainResult;
+    }
+
+    public void setCsvChainResult(CSVChainResult csvChainResult) {
+        this.csvChainResult = csvChainResult;
+    }
+
     public String getCode() {
         return code;
     }

src/main/java/cn/com/poc/thirdparty/resource/simultanous_interpretation/api/ASRApi.java

@@ -82,9 +82,9 @@ public class ASRApi {
     public GetDetailResult getDetail(String sessionId) {
         Assert.notBlank(sessionId);
         HttpUriRequest httpUriRequest = RequestBuilder.post()
-                .setUri(ENDPOINT + GET_DETAIL_API)
+                .setUri(ENDPOINT + GET_DETAIL_API + "?sessionId=" + sessionId)
 //                .addHeader(new BasicHeader(HttpHeaders.CONTENT_TYPE, ContentType.APPLICATION_JSON.toString()))
-                .addParameter("sessionId", sessionId)
+//                .addParameter("sessionId", sessionId)
                 .build();
         return LocalHttpClient.executeJsonResult(httpUriRequest, GetDetailResult.class);
     }

src/main/java/cn/com/poc/thirdparty/service/impl/ChainServiceImpl.java

@@ -23,10 +23,6 @@ public class ChainServiceImpl implements ChainService {
 
     private Logger logger = LoggerFactory.getLogger(ChainServiceImpl.class);
 
-
-    @Value(value = "${large-model.apikey}")
-    private String API_KEY;
-
     @Resource
     private AIDialogueService aiDialogueService;
 
@@ -53,17 +49,21 @@ public class ChainServiceImpl implements ChainService {
     @Override
     public CSVChainResult csvChain(CSVChainResponse response) {
         logger.info("csvChain response : {}", response);
-        response.setApiKey(API_KEY);
-        CSVChainResult csvChainResult = aiDialogueService.csvChain(response);
-        if (csvChainResult == null || csvChainResult.getStatus().equals("error")) {
-            logger.error("csvChain result error : {} , response:{}", csvChainResult, response);
-            return null;
-        }
-        if (StringUtils.isBlank(csvChainResult.getResult())) {
-            logger.warn("csvChain result sqlResult is blank : {} , response:{}", csvChainResult, response);
+        try {
+            CSVChainResult csvChainResult = aiDialogueService.csvChain(response);
+            if (csvChainResult == null || csvChainResult.getStatus().equals("error")) {
+                logger.error("csvChain result error : {} , response:{}", csvChainResult, response);
+                return null;
+            }
+            if (StringUtils.isBlank(csvChainResult.getResult())) {
+                logger.warn("csvChain result sqlResult is blank : {} , response:{}", csvChainResult, response);
+                return null;
+            }
+
+            return csvChainResult;
+        } catch (Exception e) {
+            logger.error("csv chain error:{}", e.getMessage());
             return null;
         }
-
-        return csvChainResult;
     }
 }

src/test/java/cn/com/poc/meeting/ASRTest.java

@@ -33,7 +33,7 @@ public class ASRTest {
 
     @Test
     public void test_asrGetDetail() {
-        String sessionId = "meeting_assistant_c9c7021dd0db4ecda6bf7eb3a325e745_4";
+        String sessionId = "a9ee310bb9754a089cf64429b9e42ea5";
         AsrOfflineDetailResult asrServiceDetail = asrService.getDetail(sessionId);
         System.out.println(JsonUtils.serialize(asrServiceDetail));
     }