Merge dev.s-ul.net:rinsama/aqua into v1-dev

This commit is contained in:
Azalea
2024-03-22 14:58:41 -04:00
14 changed files with 394 additions and 1 deletions

View File

@@ -83,6 +83,9 @@ public class UpsertUserAll implements Serializable {
@Nullable
private List<Map<String, Object>> userNetBattleData;
@Nullable
private List<Map<String, Object>> userCMissionList;
@Nullable
@JsonProperty("isNewCharacterList")
private String isNewCharacterList;
@@ -107,4 +110,8 @@ public class UpsertUserAll implements Serializable {
@JsonProperty("isNewMapAreaList")
private String isNewMapAreaList;
@Nullable
@JsonProperty("isNewCMissionList")
private String isNewCMissionList;
}

View File

@@ -0,0 +1,16 @@
package icu.samnyan.aqua.sega.chusan.model.response.data;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class UserCMissionProgressResp implements Serializable {
private int order;
private int stage;
private int progress;
}

View File

@@ -0,0 +1,19 @@
package icu.samnyan.aqua.sega.chusan.model.response.data;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.List;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class UserCMissionResp implements Serializable {
private long userId;
private int missionId;
private int point;
private List<UserCMissionProgressResp> userCMissionProgressList;
}

View File

@@ -0,0 +1,30 @@
package icu.samnyan.aqua.sega.chusan.model.userdata;
import com.fasterxml.jackson.annotation.JsonIgnore;
import javax.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Entity(name = "ChusanUserCMission")
@Table(name = "chusan_user_cmission")
@Data
@AllArgsConstructor
@NoArgsConstructor
public class UserCMission {
@Id
@JsonIgnore
@GeneratedValue(strategy = GenerationType.IDENTITY)
private long id;
@JsonIgnore
@ManyToOne
@JoinColumn(name = "user_id")
private UserData user;
@Column(name = "mission_id")
private int missionId;
@Column(name = "point")
private int point;
}

View File

@@ -0,0 +1,35 @@
package icu.samnyan.aqua.sega.chusan.model.userdata;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.*;
@Entity(name = "ChusanUserCMissionProgress")
@Table(name = "chusan_user_cmission_progress", uniqueConstraints = {@UniqueConstraint(columnNames = {"user_id", "mission_id", "order"})})
@Data
@AllArgsConstructor
@NoArgsConstructor
public class UserCMissionProgress {
@Id
@JsonIgnore
@GeneratedValue(strategy = GenerationType.IDENTITY)
private long id;
@JsonIgnore
@ManyToOne
@JoinColumn(name = "user_id")
private UserData user;
@Column(name = "mission_id")
private int missionId;
@Column(name = "`order`")
private int order;
private int stage;
private int progress;
}