Commit bb1c1abd authored by alex yao's avatar alex yao

fix

parent 4c9b290a
...@@ -617,9 +617,10 @@ public class AgentApplicationInfoServiceImpl implements AgentApplicationInfoServ ...@@ -617,9 +617,10 @@ public class AgentApplicationInfoServiceImpl implements AgentApplicationInfoServ
int index = 0; int index = 0;
for (Message message : messages) { for (Message message : messages) {
if (message.getContent() instanceof List) { if (message.getContent() instanceof List) {
List<HashMap<String,Object>> content = (List<HashMap<String,Object>>) message.getContent(); List<HashMap<String, Object>> content = (List<HashMap<String, Object>>) message.getContent();
if (content.get(0).get("type").equals("text")) { HashMap<String, Object> map = content.get(0);
message.setContent(content.get(0).get("text").toString()); if (map.containsKey("type") && map.get("type").equals("text") && map.containsKey("text")) {
message.setContent(map.get("text").toString());
} }
} }
messageArray[index++] = message; messageArray[index++] = message;
...@@ -650,7 +651,7 @@ public class AgentApplicationInfoServiceImpl implements AgentApplicationInfoServ ...@@ -650,7 +651,7 @@ public class AgentApplicationInfoServiceImpl implements AgentApplicationInfoServ
} }
BizAgentApplicationMallEntity mallEntity = bizAgentApplicationMallService.get(id); BizAgentApplicationMallEntity mallEntity = bizAgentApplicationMallService.get(id);
if(mallEntity == null){ if (mallEntity == null) {
throw new BusinessException("应用不存在"); throw new BusinessException("应用不存在");
} }
...@@ -659,23 +660,23 @@ public class AgentApplicationInfoServiceImpl implements AgentApplicationInfoServ ...@@ -659,23 +660,23 @@ public class AgentApplicationInfoServiceImpl implements AgentApplicationInfoServ
collectEntity.setAgentId(agentId); collectEntity.setAgentId(agentId);
collectEntity.setMemberId(userBaseEntity.getUserId().intValue()); collectEntity.setMemberId(userBaseEntity.getUserId().intValue());
List<BizMemberAgentApplicationCollectEntity> collectEntities = bizMemberAgentApplicationCollectService.findByExample(collectEntity, new PagingInfo()); List<BizMemberAgentApplicationCollectEntity> collectEntities = bizMemberAgentApplicationCollectService.findByExample(collectEntity, new PagingInfo());
if(collectEntities.isEmpty() || CommonConstant.IsDeleted.N.equals(collectEntities.get(0).getIsCollect())){ //如果没被收藏 if (collectEntities.isEmpty() || CommonConstant.IsDeleted.N.equals(collectEntities.get(0).getIsCollect())) { //如果没被收藏
// 收藏该应用 // 收藏该应用
// 说明从来没收藏过 // 说明从来没收藏过
if(collectEntities.isEmpty()){ if (collectEntities.isEmpty()) {
// 在用户收藏表中添加数据 // 在用户收藏表中添加数据
BizMemberAgentApplicationCollectEntity entity = new BizMemberAgentApplicationCollectEntity(); BizMemberAgentApplicationCollectEntity entity = new BizMemberAgentApplicationCollectEntity();
entity.setIsCollect(CommonConstant.IsDeleted.Y); entity.setIsCollect(CommonConstant.IsDeleted.Y);
entity.setMemberId(userBaseEntity.getUserId().intValue()); entity.setMemberId(userBaseEntity.getUserId().intValue());
entity.setAgentId(agentId); entity.setAgentId(agentId);
bizMemberAgentApplicationCollectService.save(entity); bizMemberAgentApplicationCollectService.save(entity);
}else{ // 说明之前收藏过,则只需要做个修改 } else { // 说明之前收藏过,则只需要做个修改
collectEntity.setIsCollect(CommonConstant.IsDeleted.Y); collectEntity.setIsCollect(CommonConstant.IsDeleted.Y);
bizMemberAgentApplicationCollectService.update(collectEntity); bizMemberAgentApplicationCollectService.update(collectEntity);
} }
// 在应用广场的应用中 添加收藏数 // 在应用广场的应用中 添加收藏数
mallEntity.setCollectNumber(mallEntity.getCollectNumber() + 1); mallEntity.setCollectNumber(mallEntity.getCollectNumber() + 1);
}else { } else {
// 取消收藏该应用 // 取消收藏该应用
collectEntities.get(0).setIsCollect(CommonConstant.IsDeleted.N); collectEntities.get(0).setIsCollect(CommonConstant.IsDeleted.N);
bizMemberAgentApplicationCollectService.update(collectEntity); bizMemberAgentApplicationCollectService.update(collectEntity);
...@@ -697,24 +698,24 @@ public class AgentApplicationInfoServiceImpl implements AgentApplicationInfoServ ...@@ -697,24 +698,24 @@ public class AgentApplicationInfoServiceImpl implements AgentApplicationInfoServ
collectEntity.setAgentId(agentId); collectEntity.setAgentId(agentId);
collectEntity.setMemberId(userBaseEntity.getUserId().intValue()); collectEntity.setMemberId(userBaseEntity.getUserId().intValue());
List<BizMemberAgentApplicationCollectEntity> collectEntities = bizMemberAgentApplicationCollectService.findByExample(collectEntity, new PagingInfo()); List<BizMemberAgentApplicationCollectEntity> collectEntities = bizMemberAgentApplicationCollectService.findByExample(collectEntity, new PagingInfo());
if(collectEntities.isEmpty() || CommonConstant.IsDeleted.N.equals(collectEntities.get(0).getIsCollect())){ //如果没被收藏 if (collectEntities.isEmpty() || CommonConstant.IsDeleted.N.equals(collectEntities.get(0).getIsCollect())) { //如果没被收藏
// 收藏该应用 // 收藏该应用
// 说明从来没收藏过 // 说明从来没收藏过
if(collectEntities.isEmpty()){ if (collectEntities.isEmpty()) {
// 在用户收藏表中添加数据 // 在用户收藏表中添加数据
BizMemberAgentApplicationCollectEntity entity = new BizMemberAgentApplicationCollectEntity(); BizMemberAgentApplicationCollectEntity entity = new BizMemberAgentApplicationCollectEntity();
entity.setIsCollect(CommonConstant.IsDeleted.Y); entity.setIsCollect(CommonConstant.IsDeleted.Y);
entity.setMemberId(userBaseEntity.getUserId().intValue()); entity.setMemberId(userBaseEntity.getUserId().intValue());
entity.setAgentId(agentId); entity.setAgentId(agentId);
bizMemberAgentApplicationCollectService.save(entity); bizMemberAgentApplicationCollectService.save(entity);
}else{ // 说明之前收藏过,则只需要做个修改 } else { // 说明之前收藏过,则只需要做个修改
collectEntity.setIsCollect(CommonConstant.IsDeleted.Y); collectEntity.setIsCollect(CommonConstant.IsDeleted.Y);
bizMemberAgentApplicationCollectService.update(collectEntity); bizMemberAgentApplicationCollectService.update(collectEntity);
} }
}else { } else {
// 取消收藏该应用 // 取消收藏该应用
collectEntities.get(0).setIsCollect(CommonConstant.IsDeleted.N); collectEntities.get(0).setIsCollect(CommonConstant.IsDeleted.N);
bizMemberAgentApplicationCollectService.update( collectEntities.get(0)); bizMemberAgentApplicationCollectService.update(collectEntities.get(0));
} }
} }
} }
...@@ -193,13 +193,7 @@ public class AgentApplicationServiceImpl implements AgentApplicationService { ...@@ -193,13 +193,7 @@ public class AgentApplicationServiceImpl implements AgentApplicationService {
CommonThreadPoolExecutor.addTask(() -> { CommonThreadPoolExecutor.addTask(() -> {
Message message = new Message(); Message message = new Message();
message.setRole(AgentApplicationDialoguesRecordConstants.ROLE.USER); message.setRole(AgentApplicationDialoguesRecordConstants.ROLE.USER);
MultiContent multiContent = new MultiContent(); message.setContent("请给我生成一个推荐问题,不超过50字,只需输出问题即可,不要输出额外的内容,不要换行");
multiContent.setText("请给我生成一个推荐问题,不超过50字,只需输出问题即可,不要输出额外的内容,不要换行");
multiContent.setType("text");
ArrayList<MultiContent> multiContents = new ArrayList<>();
multiContents.add(multiContent);
message.setContent(multiContents);
Message[] messages = new Message[]{message}; Message[] messages = new Message[]{message};
LargeModelResponse largeModelResponse = new LargeModelResponse(); LargeModelResponse largeModelResponse = new LargeModelResponse();
...@@ -228,23 +222,13 @@ public class AgentApplicationServiceImpl implements AgentApplicationService { ...@@ -228,23 +222,13 @@ public class AgentApplicationServiceImpl implements AgentApplicationService {
if (CollectionUtils.isNotEmpty(recordEntities)) { if (CollectionUtils.isNotEmpty(recordEntities)) {
for (BizAgentApplicationDialoguesRecordEntity entity : recordEntities) { for (BizAgentApplicationDialoguesRecordEntity entity : recordEntities) {
Message message = new Message(); Message message = new Message();
MultiContent multiContent = new MultiContent(); message.setContent(entity.getContent());
multiContent.setType("text");
multiContent.setText(entity.getContent());
message.setContent(new ArrayList<MultiContent>() {{
add(multiContent);
}});
message.setRole(entity.getRole()); message.setRole(entity.getRole());
messages.add(message); messages.add(message);
} }
} }
Message message = new Message(); Message message = new Message();
MultiContent multiContent = new MultiContent(); message.setContent(input);
multiContent.setType("text");
multiContent.setText(input);
message.setContent(new ArrayList<MultiContent>() {{
add(multiContent);
}});
message.setRole(AgentApplicationDialoguesRecordConstants.ROLE.USER); message.setRole(AgentApplicationDialoguesRecordConstants.ROLE.USER);
messages.add(message); messages.add(message);
logger.info("--------- Build Messages dialogsId:{},agentId:{},messages:{}--------------", dialogsId, agentId, messages); logger.info("--------- Build Messages dialogsId:{},agentId:{},messages:{}--------------", dialogsId, agentId, messages);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment