Bennett/AquaDX
1
0
Fork 0
forked from Cookies_Github_mirror/AquaDX
Code Pull Requests Actions Releases Activity

[general] Fix all type mismatch with db

Browse Source
This commit is contained in:
samnyan
2020-12-25 14:15:04 +08:00
parent 6152e8ef0a
commit ff5eab48c7
78 changed files with 165 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/icu/samnyan/aqua/sega/general/dao/CardRepository.java
View File

@@ -12,7 +12,7 @@ import java.util.Optional;
@Repository("SegaCardRepository")
public interface CardRepository extends JpaRepository<Card, Long> {
Optional<Card> findByExtId(int extId);
Optional<Card> findByExtId(Long extId);
Optional<Card> findByLuid(String luid);
}

2
src/main/java/icu/samnyan/aqua/sega/general/model/Card.java
View File

@@ -26,7 +26,7 @@ public class Card implements Serializable {
// A external id
@Column(name = "ext_id", unique = true)
private Integer extId;
private Long extId;
// Access Code
@Column(unique = true)

1
src/main/java/icu/samnyan/aqua/sega/general/model/PropertyEntry.java
View File

@@ -24,6 +24,7 @@ public class PropertyEntry implements Serializable {
@Column(unique = true)
private String propertyKey;
@Column(columnDefinition = "TEXT")
private String propertyValue;
public PropertyEntry(String propertyKey, String propertyValue) {

9
src/main/java/icu/samnyan/aqua/sega/general/service/CardService.java
View File

@@ -28,15 +28,16 @@ public class CardService {
* @return Optional of a Card
*/
public Optional<Card> getCardByExtId(String extId) {
return cardRepository.findByExtId(Integer.parseInt(extId));
return cardRepository.findByExtId(Long.parseLong(extId));
}
/**
* Find a card by External Id
*
* @param extId External Id
* @return Optional of a Card
*/
public Optional<Card> getCardByExtId(int extId) {
public Optional<Card> getCardByExtId(Long extId) {
return cardRepository.findByExtId(extId);
}
@@ -57,9 +58,9 @@ public class CardService {
public Card registerByAccessCode(String accessCode) {
Card card = new Card();
card.setLuid(accessCode);
int extId = ThreadLocalRandom.current().nextInt(99999999);
long extId = ThreadLocalRandom.current().nextLong(99999999);
while (cardRepository.findByExtId(extId).isPresent()) {
extId = ThreadLocalRandom.current().nextInt(99999999);
extId = ThreadLocalRandom.current().nextLong(99999999);
}
card.setExtId(extId);
card.setRegisterTime(LocalDateTime.now());