wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hotfix: model v3按钮排序

Browse Source
This commit is contained in:
yanglin 2024-11-18 13:48:39 +08:00
parent 7a6767e56e
commit f46bfe65fd
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/ParsedButtonV3.java
View File

@ -93,6 +93,10 @@ public class ParsedButtonV3 implements MessageButton {
@Nullable @JsonInclude(JsonInclude.Include.NON_NULL) @Nullable @JsonInclude(JsonInclude.Include.NON_NULL)
private Integer priority; private Integer priority;
public int determinePriority() {
return priority == null ? Integer.MAX_VALUE : priority;
}
public List<ButtonStyleEnum> parseStyle() { public List<ButtonStyleEnum> parseStyle() {
if (style == null) return Collections.emptyList(); if (style == null) return Collections.emptyList();
return JSON.parseArray(style.toJSONString(), ButtonStyleEnum.class); return JSON.parseArray(style.toJSONString(), ButtonStyleEnum.class);

5
msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/ParsedModelV3.java
View File

@ -12,6 +12,7 @@ import javax.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
@ -82,7 +83,9 @@ public class ParsedModelV3 implements MessageButtonProvider<ParsedButtonV3> {
} }
public List<ParsedButtonV3> determineButtons() { public List<ParsedButtonV3> determineButtons() {
return buttons == null ? Collections.emptyList() : buttons; List<ParsedButtonV3> buttons = this.buttons == null ? Collections.emptyList() : this.buttons;
buttons.sort(Comparator.comparingInt(ParsedButtonV3::determinePriority));
return buttons;
} }
public void removeEmptyKVGroups() { public void removeEmptyKVGroups() {