diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatController.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatController.java index c3af4f9d0..17c3db90c 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatController.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatController.java @@ -22,11 +22,10 @@ public class ChatController { private ChatManageService chatService; @PostMapping("/save") - public Boolean save(@RequestParam(value = "chatName") String chatName, + public Long save(@RequestParam(value = "chatName") String chatName, @RequestParam(value = "agentId", required = false) Integer agentId, HttpServletRequest request, HttpServletResponse response) { - chatService.addChat(UserHolder.findUser(request, response), chatName, agentId); - return true; + return chatService.addChat(UserHolder.findUser(request, response), chatName, agentId); } @GetMapping("/getAll") diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java index 4bbcd7c2d..f99e7223d 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java @@ -273,12 +273,14 @@ public class ModelConverter { List measures = modelReq.getModelDetail().getMeasures(); List dimensions = modelReq.getModelDetail().getDimensions(); List identifiers = modelReq.getModelDetail().getIdentifiers(); + List fields = modelReq.getModelDetail().getFields(); if (measures != null) { for (Measure measure : measures) { if (StringUtils.isNotBlank(measure.getBizName()) && StringUtils.isBlank(measure.getExpr())) { measure.setExpr(measure.getBizName()); + fields.add(new Field(measure.getBizName(), "")); } } } @@ -287,6 +289,7 @@ public class ModelConverter { if (StringUtils.isNotBlank(dimension.getBizName()) && StringUtils.isBlank(dimension.getExpr())) { dimension.setExpr(dimension.getBizName()); + fields.add(new Field(dimension.getBizName(), "")); } } } @@ -297,6 +300,7 @@ public class ModelConverter { identify.setName(identify.getBizName()); } identify.setIsCreateDimension(1); + fields.add(new Field(identify.getBizName(), "")); } }