diff --git a/src/main/java/com/yolo/keyborad/model/vo/character/KeyboardCharacterRespVO.java b/src/main/java/com/yolo/keyborad/model/vo/character/KeyboardCharacterRespVO.java index 7cb8acf..6b782bf 100644 --- a/src/main/java/com/yolo/keyborad/model/vo/character/KeyboardCharacterRespVO.java +++ b/src/main/java/com/yolo/keyborad/model/vo/character/KeyboardCharacterRespVO.java @@ -23,7 +23,6 @@ public class KeyboardCharacterRespVO { @Schema(description="标题") private String characterName; - @Schema(description="背景描述") private String characterBackground; diff --git a/src/main/java/com/yolo/keyborad/model/vo/character/KeyboardUserCharacterVO.java b/src/main/java/com/yolo/keyborad/model/vo/character/KeyboardUserCharacterVO.java index 5b0af17..d896a09 100644 --- a/src/main/java/com/yolo/keyborad/model/vo/character/KeyboardUserCharacterVO.java +++ b/src/main/java/com/yolo/keyborad/model/vo/character/KeyboardUserCharacterVO.java @@ -29,5 +29,7 @@ public class KeyboardUserCharacterVO { @Schema(description = "emoji") private String emoji; + @Schema(description = "角色 Id") + private Long characterId; } \ No newline at end of file diff --git a/src/main/java/com/yolo/keyborad/service/impl/KeyboardCharacterServiceImpl.java b/src/main/java/com/yolo/keyborad/service/impl/KeyboardCharacterServiceImpl.java index e15a41c..6036909 100644 --- a/src/main/java/com/yolo/keyborad/service/impl/KeyboardCharacterServiceImpl.java +++ b/src/main/java/com/yolo/keyborad/service/impl/KeyboardCharacterServiceImpl.java @@ -52,10 +52,12 @@ public class KeyboardCharacterServiceImpl extends ServiceImpl userCharacterVOList = keyboardUserCharacterMapper.selectByUserId(userId); + List keyboardCharacterRespVOS = BeanUtil.copyToList(keyboardCharacters, KeyboardCharacterRespVO.class); + keyboardCharacterRespVOS.forEach(character -> { character.setAdded(userCharacterVOList.stream().anyMatch(userCharacter -> - userCharacter.getId().equals(character.getId()))); + userCharacter.getCharacterId().equals(character.getId()))); }); return keyboardCharacterRespVOS; @@ -75,7 +77,7 @@ public class KeyboardCharacterServiceImpl extends ServiceImpl keyboardCharacterRespVOS = BeanUtil.copyToList(keyboardCharacters, KeyboardCharacterRespVO.class); keyboardCharacterRespVOS.forEach(character -> { character.setAdded(userCharacterVOList.stream().anyMatch(userCharacter -> - userCharacter.getId().equals(character.getId()))); + userCharacter.getCharacterId().equals(character.getId()))); }); return keyboardCharacterRespVOS; }