From 35bb4e4c01345ed577a58d3716075842fd01f873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=BE=99?= Date: Mon, 2 Dec 2024 14:59:07 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20(feature/REQ-3167)=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=B5=84=E6=BA=90=EF=BC=8C=E8=A7=A6=E5=8F=91?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9D=83=E9=99=90=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tyr/server/controller/terminal/TerminalController.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/terminal/TerminalController.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/terminal/TerminalController.java index ae55ca57..7ba2c898 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/terminal/TerminalController.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/terminal/TerminalController.java @@ -22,6 +22,7 @@ import cn.axzo.tyr.client.model.res.TerminalRes; import cn.axzo.tyr.server.service.SaasFeatureResourceService; import cn.axzo.tyr.server.service.TerminalService; import cn.hutool.json.JSONObject; +import com.alibaba.fastjson.JSON; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; @@ -176,6 +177,7 @@ public class TerminalController implements TerminalApi { .terminalCode(req.getTerminalCode()) .build()) .getData(); + log.info("terminalRes,{}", JSON.toJSONString(terminalRes)); // 找不到端，有可能是以前的旧端设置的，为了兼容，直接使用原来的new TerminalInfo方式返回 if (CollectionUtils.isEmpty(terminalRes)) { return ApiResult.ok(new TerminalInfo(req.getTerminalCode())); @@ -185,7 +187,7 @@ public class TerminalController implements TerminalApi { log.warn("重复的端信息，{}", req.getTerminalCode()); } - return ApiResult.ok(terminalRes.stream() + ApiResult ok = ApiResult.ok(terminalRes.stream() .map(e -> { Boolean isGov = Objects.equals(e.getTerminalBizType(), GOV_BIZ_TYPE); TerminalInfo terminalInfo = new TerminalInfo(req.getTerminalCode()); @@ -197,5 +199,7 @@ public class TerminalController implements TerminalApi { }) .findFirst() .orElse(null)); + log.info("terminalRes,{}", JSON.toJSONString(ok)); + return ok; } }