From 3dd5b4d1303a8c2f2342b63c444e8b0bae70730a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=BE=99?= Date: Mon, 9 Dec 2024 11:10:17 +0800 Subject: [PATCH] =?UTF-8?q?feat:(REQ-3167)=20=E5=A2=9E=E5=8A=A0=E7=AB=AF?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=85=81=E8=AE=B8=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/axzo/tyr/client/model/res/TerminalConfigRes.java | 5 +++++ .../main/java/cn/axzo/tyr/client/model/res/TerminalRes.java | 5 +++++ .../tyr/server/controller/terminal/TerminalController.java | 3 +++ 3 files changed, 13 insertions(+) diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/TerminalConfigRes.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/TerminalConfigRes.java index d8c0de8a..fd90e99a 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/TerminalConfigRes.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/TerminalConfigRes.java @@ -65,5 +65,10 @@ public class TerminalConfigRes { * DISABLED,ENABLED */ private String status; + + /** + * 是否允许删除 + */ + private Boolean allowDelete; } } diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/TerminalRes.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/TerminalRes.java index 4c6a2e32..9e45c49d 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/TerminalRes.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/TerminalRes.java @@ -31,4 +31,9 @@ public class TerminalRes { * 是否允许克隆 */ private Boolean allowClone; + + /** + * 是否允许删除 + */ + private Boolean allowDelete; } 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 d998ac52..82eeca8f 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 @@ -112,6 +112,9 @@ public class TerminalController implements TerminalApi { .allowClone(Optional.ofNullable(terminalBizType) .map(TerminalConfigRes.TerminalBizType::getAllowClone) .orElse(false)) + .allowDelete(Optional.ofNullable(terminalBizType) + .map(TerminalConfigRes.TerminalBizType::getAllowDelete) + .orElse(false)) .featureType(e.getFeatureType()) .build(); })