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

[F] Fix merge conflicts

pull/23/head
Azalea 2024-03-22 15:06:31 -04:00
parent 2a7ce54c28
commit e91029f66e
8 changed files with 15 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetGameMapAreaConditionHandler.java
View File

@ -1,7 +1,7 @@
package icu.samnyan.aqua.sega.chusan.handler.impl;
package icu.samnyan.aqua.sega.chusan.handler;
import com.fasterxml.jackson.core.JsonProcessingException;
import icu.samnyan.aqua.sega.chusan.handler.BaseHandler;
import icu.samnyan.aqua.sega.general.BaseHandler;
import icu.samnyan.aqua.sega.util.jackson.StringMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

4
src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserCMissionHandler.java
View File

@ -1,12 +1,12 @@
package icu.samnyan.aqua.sega.chusan.handler.impl;
package icu.samnyan.aqua.sega.chusan.handler;
import com.fasterxml.jackson.core.JsonProcessingException;
import icu.samnyan.aqua.sega.chusan.dao.userdata.UserCMissionProgressRepository;
import icu.samnyan.aqua.sega.chusan.dao.userdata.UserCMissionRepository;
import icu.samnyan.aqua.sega.chusan.handler.BaseHandler;
import icu.samnyan.aqua.sega.chusan.model.response.data.UserCMissionProgressResp;
import icu.samnyan.aqua.sega.chusan.model.response.data.UserCMissionResp;
import icu.samnyan.aqua.sega.chusan.model.userdata.UserCMission;
import icu.samnyan.aqua.sega.general.BaseHandler;
import icu.samnyan.aqua.sega.util.jackson.StringMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

4
src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserNetBattleRankingInfoHandler.java
View File

@ -1,7 +1,7 @@
package icu.samnyan.aqua.sega.chusan.handler.impl;
package icu.samnyan.aqua.sega.chusan.handler;
import com.fasterxml.jackson.core.JsonProcessingException;
import icu.samnyan.aqua.sega.chusan.handler.BaseHandler;
import icu.samnyan.aqua.sega.general.BaseHandler;
import icu.samnyan.aqua.sega.util.jackson.StringMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMission.java
View File

@ -1,7 +1,7 @@
package icu.samnyan.aqua.sega.chusan.model.userdata;
import com.fasterxml.jackson.annotation.JsonIgnore;
import javax.persistence.*;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

3
src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMissionProgress.java
View File

@ -1,12 +1,11 @@
package icu.samnyan.aqua.sega.chusan.model.userdata;
import com.fasterxml.jackson.annotation.JsonIgnore;
import jakarta.persistence.*;
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

20
src/main/resources/db/migration/mariadb/V262__add_chusan_luminous_support.sql → src/main/resources/db/migration/mariadb/V256__add_chusan_luminous_support.sql
View File

@ -1,15 +1,13 @@
CREATE TABLE chusan_user_cmission
(
id BIGINT AUTO_INCREMENT NOT NULL,
user_id BIGINT NULL,
user_id BIGINT NOT NULL ,
mission_id INT NULL,
point INT NULL,
CONSTRAINT pk_chusan_user_cmission PRIMARY KEY (id)
CONSTRAINT pk_chusan_user_cmission PRIMARY KEY (id),
CONSTRAINT fku_chusan_user_cmission FOREIGN KEY (user_id) REFERENCES chusan_user_data (id) ON DELETE CASCADE ON UPDATE CASCADE
);
ALTER TABLE chusan_user_cmission
ADD CONSTRAINT FK_CHUSAN_USER_CMISSION_ON_USER FOREIGN KEY (user_id) REFERENCES chusan_user_data (id);
CREATE TABLE chusan_user_cmission_progress
(
id BIGINT AUTO_INCREMENT NOT NULL,
@ -18,11 +16,7 @@ CREATE TABLE chusan_user_cmission_progress
`order` INT NOT NULL,
stage INT NULL,
progress INT NULL,
CONSTRAINT pk_chusan_user_cmission_progress PRIMARY KEY (id)
);
ALTER TABLE chusan_user_cmission_progress
ADD CONSTRAINT uc_6ab791e9e8fee2b3fab35d3d2 UNIQUE (user_id, mission_id, `order`);
ALTER TABLE chusan_user_cmission_progress
ADD CONSTRAINT FK_CHUSAN_USER_CMISSION_PROGRESS_ON_USER FOREIGN KEY (user_id) REFERENCES chusan_user_data (id);
CONSTRAINT pk_chusan_user_cmission_progress PRIMARY KEY (id),
CONSTRAINT fku_chusan_user_cmission_progress FOREIGN KEY (user_id) REFERENCES chusan_user_data (id) ON DELETE CASCADE ON UPDATE CASCADE,
CONSTRAINT unque_chusan_user_cmission_progress UNIQUE (user_id, mission_id, `order`)
);

28
src/main/resources/db/migration/mysql/V262__add_chusan_luminous_support.sql
View File

@ -1,28 +0,0 @@
CREATE TABLE chusan_user_cmission
(
id BIGINT AUTO_INCREMENT NOT NULL,
user_id BIGINT NULL,
mission_id INT NULL,
point INT NULL,
CONSTRAINT pk_chusan_user_cmission PRIMARY KEY (id)
);
ALTER TABLE chusan_user_cmission
ADD CONSTRAINT FK_CHUSAN_USER_CMISSION_ON_USER FOREIGN KEY (user_id) REFERENCES chusan_user_data (id);
CREATE TABLE chusan_user_cmission_progress
(
id BIGINT AUTO_INCREMENT NOT NULL,
user_id BIGINT NULL,
mission_id INT NULL,
`order` INT NOT NULL,
stage INT NULL,
progress INT NULL,
CONSTRAINT pk_chusan_user_cmission_progress PRIMARY KEY (id)
);
ALTER TABLE chusan_user_cmission_progress
ADD CONSTRAINT uc_6ab791e9e8fee2b3fab35d3d2 UNIQUE (user_id, mission_id, `order`);
ALTER TABLE chusan_user_cmission_progress
ADD CONSTRAINT FK_CHUSAN_USER_CMISSION_PROGRESS_ON_USER FOREIGN KEY (user_id) REFERENCES chusan_user_data (id);

0
src/main/resources/db/migration/sqlite/V262__add_chusan_luminous_support.sql → src/main/resources/db/migration/sqlite/V256__add_chusan_luminous_support.sql
View File