From 0a6aeb254f9b544088cccc82004c8bbe57f21e0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=BE=99?= Date: Thu, 28 Nov 2024 16:45:21 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20(feature/REQ-3167)=20=E6=89=A9=E5=B1=95?= =?UTF-8?q?terminalInfo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/terminal/TerminalController.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) 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 9233eeae..71db3a9a 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 @@ -46,6 +46,8 @@ public class TerminalController implements TerminalApi { private TerminalService terminalService; private static final String GOV_BIZ_TYPE = "GOV"; + private static final String PC_TYPE = "PC"; + private static final String APP_TYPE = "APP"; @Override public ApiResult getConfig() { @@ -184,11 +186,16 @@ public class TerminalController implements TerminalApi { } return ApiResult.ok(terminalRes.stream() - .map(e -> TerminalInfo.builder() - .rawTerminalString(req.getTerminalCode()) - .newTerminalString(req.getTerminalCode()) - .bizData(new JSONObject().putOpt("isGov", Objects.equals(e.getTerminalBizType(), GOV_BIZ_TYPE))) - .build()) + .map(e -> { + Boolean isGov = Objects.equals(e.getTerminalBizType(), GOV_BIZ_TYPE); + return TerminalInfo.builder() + .rawTerminalString(req.getTerminalCode()) + .newTerminalString(req.getTerminalCode()) + .bizData(new JSONObject() + .putOpt("isGov", isGov) + .putOpt("isGovPC", isGov && Objects.equals(e.getTerminalType(), PC_TYPE))) + .build(); + }) .findFirst() .orElse(null)); }