lzc256
/
AquaDX
mirror of https://github.com/hykilpikonna/AquaDX
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

[F] Fix mai event id

pull/29/head
Azalea 2024-03-26 22:27:12 -04:00
parent 5ea2615b93
commit f314b3982e
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/icu/samnyan/aqua/net/games/Models.kt
View File

@ -111,7 +111,7 @@ open class BaseEntity(
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
@JsonIgnore @JsonIgnore
var id: Long = 0 open var id: Long = 0
) : JavaSerializable { ) : JavaSerializable {
override fun toString() = JACKSON.writeValueAsString(this) override fun toString() = JACKSON.writeValueAsString(this)
} }

3
src/main/java/icu/samnyan/aqua/sega/maimai2/model/GameDataEntities.kt
View File

@ -11,6 +11,9 @@ import java.time.LocalDateTime
@Data @Entity @Data @Entity
@Table(name = "maimai2_game_event") @Table(name = "maimai2_game_event")
class Mai2GameEvent : BaseEntity() { class Mai2GameEvent : BaseEntity() {
@JsonIgnore(false)
override var id = 0L
var type = 0 var type = 0
var startDate: String? = null var startDate: String? = null
var endDate: String? = null var endDate: String? = null

6
src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/Mai2UserDetail.kt
View File

@ -1,5 +1,6 @@
package icu.samnyan.aqua.sega.maimai2.model.userdata package icu.samnyan.aqua.sega.maimai2.model.userdata
import com.fasterxml.jackson.annotation.JsonIgnore
import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonInclude
import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonProperty
import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.databind.annotation.JsonSerialize
@ -13,8 +14,8 @@ import jakarta.persistence.*
@Entity(name = "Maimai2UserData") @Entity(name = "Maimai2UserData")
@Table(name = "maimai2_user_detail") @Table(name = "maimai2_user_detail")
class Mai2UserDetail( class Mai2UserDetail(
@JsonSerialize(using = AccessCodeSerializer::class) @get:JsonSerialize(using = AccessCodeSerializer::class)
@JsonProperty(value = "accessCode", access = JsonProperty.Access.READ_ONLY) @get:JsonProperty(value = "accessCode", access = JsonProperty.Access.READ_ONLY)
@OneToOne @OneToOne
@JoinColumn(name = "aime_card_id", unique = true) @JoinColumn(name = "aime_card_id", unique = true)
override var card: Card? = null, override var card: Card? = null,
@ -149,6 +150,7 @@ class Mai2UserDetail(
var currentPlayCount: Int? = 0, var currentPlayCount: Int? = 0,
var renameCredit: Int? = 0 var renameCredit: Int? = 0
) : BaseEntity(), IGenericUserData { ) : BaseEntity(), IGenericUserData {
@get:JsonIgnore
override val totalScore: Long override val totalScore: Long
get() = totalDeluxscore get() = totalDeluxscore
} }