Browse Source

Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3

zhongwei
luyie 2 months ago
parent
commit
8dcd5168f3
  1. 2
      hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/constants/ScheduledConstant.java
  2. 7
      hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/interactive/controller/FontEndInteractiveController.java

2
hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/constants/ScheduledConstant.java

@ -33,5 +33,5 @@ public interface ScheduledConstant {
String DEVICE_LEDGER_DATA_GENERATE = "deviceLedgerDataGenerate"; String DEVICE_LEDGER_DATA_GENERATE = "deviceLedgerDataGenerate";
/**设备台账数据存入向量数据库表名**/ /**设备台账数据存入向量数据库表名**/
String DEVICE_LEDGER_CLASS_NAME = "Hzn_lm_deviceLedger_data"; String DEVICE_LEDGER_CLASS_NAME = "Hzims_deviceLedger_data";
} }

7
hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/interactive/controller/FontEndInteractiveController.java

@ -89,8 +89,11 @@ public class FontEndInteractiveController {
@GetMapping("/getAnswerByChatId") @GetMapping("/getAnswerByChatId")
public R getAnswerByChatId(@RequestParam("chatId") @ApiParam("会话ID") String chatId){ public R getAnswerByChatId(@RequestParam("chatId") @ApiParam("会话ID") String chatId){
List<AnswerVO> answers = hznlmInvokeService.getAnswerBySessionIds(chatId); List<AnswerVO> answers = hznlmInvokeService.getAnswerBySessionIds(chatId);
if(Func.isNotEmpty(answers) && answers.size() == 1 && answers.get(0).getStatus().intValue() == 0) { if(Func.isNotEmpty(answers) && answers.size() == 1) {
return R.data(answers.get(0)); AnswerVO answerVO = answers.get(0);
if(answerVO.getStatus().intValue() == 0 || answerVO.getStatus().intValue() == -2) {
return R.data(answerVO);
}
} }
return R.success("操作成功!"); return R.success("操作成功!");
} }

Loading…
Cancel
Save