From 3a54798d5f985aa8fa4be49373725d329205636d Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Sat, 25 Oct 2025 09:44:39 +0800 Subject: [PATCH] [O] Pojoless --- .../samnyan/aqua/sega/diva/DivaController.kt | 36 +++++++++---------- .../handler/databank/BannerDataHandler.kt | 19 ---------- .../handler/databank/BannerInfoHandler.kt | 19 ---------- .../handler/databank/CstmzItmCtlgHandler.kt | 24 ------------- .../diva/handler/databank/PstdHCtrlHandler.kt | 18 ---------- .../handler/databank/PstdItemNgLstHandler.kt | 19 ---------- .../diva/handler/databank/QstInfHandler.kt | 19 ---------- .../diva/handler/databank/RmtWpLstHandler.kt | 18 ---------- .../diva/handler/ingame/GetPvPdHandler.kt | 5 ++- .../aqua/sega/diva/model/common/Const.java | 1 - .../common/collection/FestaCollection.java | 8 ++--- .../sega/diva/model/gamedata/Contest.java | 6 ++-- .../diva/model/gamedata/DivaCustomize.java | 6 ++-- .../sega/diva/model/gamedata/DivaModule.java | 6 ++-- .../request/databank/BannerDataRequest.java | 18 ---------- .../model/response/boot/AttendResponse.java | 25 ------------- .../response/databank/BannerDataResponse.java | 26 -------------- .../response/databank/BannerInfoResponse.java | 26 -------------- .../databank/CstmzItmCtlgResponse.java | 19 ---------- .../response/databank/PstdHCtrlResponse.java | 19 ---------- .../databank/PstdItemNgLstResponse.java | 21 ----------- .../response/databank/QstInfResponse.java | 21 ----------- .../response/databank/RmtWpLstResponse.java | 19 ---------- .../samnyan/aqua/sega/diva/util/DivaUtils.kt | 9 ++--- 24 files changed, 36 insertions(+), 371 deletions(-) delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/BannerDataHandler.kt delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/BannerInfoHandler.kt delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/CstmzItmCtlgHandler.kt delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PstdHCtrlHandler.kt delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PstdItemNgLstHandler.kt delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/QstInfHandler.kt delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/RmtWpLstHandler.kt delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/request/databank/BannerDataRequest.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/response/boot/AttendResponse.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/BannerDataResponse.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/BannerInfoResponse.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/CstmzItmCtlgResponse.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PstdHCtrlResponse.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PstdItemNgLstResponse.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/QstInfResponse.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/RmtWpLstResponse.java diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/DivaController.kt b/src/main/java/icu/samnyan/aqua/sega/diva/DivaController.kt index 517c2c1c..b075211d 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/DivaController.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/DivaController.kt @@ -19,15 +19,15 @@ import icu.samnyan.aqua.sega.diva.model.request.card.CardProcedureRequest import icu.samnyan.aqua.sega.diva.model.request.card.ChangeNameRequest import icu.samnyan.aqua.sega.diva.model.request.card.ChangePasswdRequest import icu.samnyan.aqua.sega.diva.model.request.card.RegistrationRequest -import icu.samnyan.aqua.sega.diva.model.request.databank.BannerDataRequest import icu.samnyan.aqua.sega.diva.model.request.databank.PsRankingRequest import icu.samnyan.aqua.sega.diva.model.request.ingame.* import icu.samnyan.aqua.sega.diva.model.request.user.PdUnlockRequest import icu.samnyan.aqua.sega.diva.model.request.user.PreStartRequest import icu.samnyan.aqua.sega.diva.model.request.user.SpendCreditRequest import icu.samnyan.aqua.sega.diva.model.request.user.StartRequest -import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil import icu.samnyan.aqua.sega.diva.util.DivaMapper +import icu.samnyan.aqua.sega.diva.util.DivaTime +import icu.samnyan.aqua.sega.diva.util.URIEncoder.encode import jakarta.servlet.http.HttpServletRequest import lombok.AllArgsConstructor import org.springframework.http.MediaType @@ -38,7 +38,6 @@ import org.springframework.web.bind.annotation.RestController import org.springframework.web.multipart.MultipartFile import java.net.URLDecoder import java.nio.charset.StandardCharsets -import java.time.LocalDateTime val DIVA_BAD = mapOf("stat" to "0") val DIVA_OK = emptyMap @@ -56,18 +55,11 @@ class DivaController( val changeNameHandler: ChangeNameHandler, val changePasswdHandler: ChangePasswdHandler, val registrationHandler: RegistrationHandler, - val bannerInfoHandler: BannerInfoHandler, - val bannerDataHandler: BannerDataHandler, val contestInfoHandler: ContestInfoHandler, - val cstmzItmCtlgHandler: CstmzItmCtlgHandler, val festaInfoHandler: FestaInfoHandler, val nvRankingHandler: NvRankingHandler, val psRankingHandler: PsRankingHandler, - val pstdHCtrlHandler: PstdHCtrlHandler, - val pstdItemNgLstHandler: PstdItemNgLstHandler, val pvListHandler: PvListHandler, - val qstInfHandler: QstInfHandler, - val rmtWpLstHandler: RmtWpLstHandler, val shopCatalogHandler: ShopCatalogHandler, val buyCstmzItmHandler: BuyCstmzItmHandler, val buyModuleHandler: BuyModuleHandler, @@ -82,6 +74,7 @@ class DivaController( val preStartHandler: PreStartHandler, val spendCreditHandler: SpendCreditHandler, val startHandler: StartHandler, + val db: DivaRepos ) { val logger = logger() val mapper = DivaMapper() @@ -107,23 +100,26 @@ class DivaController( "pv_list" -> pvListHandler.handle(mapper.convert(body, BaseRequest::class.java)) "ng_word" -> DIVA_OK - "rmt_wp_list" -> rmtWpLstHandler.handle(mapper.convert(body, BaseRequest::class.java)) + "rmt_wp_list" -> mapOf("rwl_lut" to DivaTime.now, "rw_lst" to "***") "festa_info" -> festaInfoHandler.handle(mapper.convert(body, BaseRequest::class.java)) "contest_info" -> contestInfoHandler.handle(mapper.convert(body, BaseRequest::class.java)) - "pv_def_chr_list" -> mapOf("pdcl_lut" to DivaDateTimeUtil.getString(LocalDateTime.now()), "pdc_lst" to "***") - "pv_ng_mdl_list" -> mapOf("pnml_lut" to DivaDateTimeUtil.getString(LocalDateTime.now()), "pnm_lst" to "***") - "cstmz_itm_ng_mdl_list" -> mapOf("cinml_lut" to DivaDateTimeUtil.getString(LocalDateTime.now()), "cinm_lst" to "***") + "pv_def_chr_list" -> mapOf("pdcl_lut" to DivaTime.now, "pdc_lst" to "***") + "pv_ng_mdl_list" -> mapOf("pnml_lut" to DivaTime.now, "pnm_lst" to "***") + "cstmz_itm_ng_mdl_list" -> mapOf("cinml_lut" to DivaTime.now, "cinm_lst" to "***") - "banner_info" -> bannerInfoHandler.handle(mapper.convert(body, BaseRequest::class.java)) - "banner_data" -> bannerDataHandler.handle(mapper.convert(body, BannerDataRequest::class.java)) + "banner_info" -> listOf("bi_lut", "bi_id", "bi_st", "bi_et", "bi_ut").associateWith { null } + "banner_data" -> mapOf("bd_ut" to DivaTime.now, "bd_ti" to "***", "bd_hs" to "***", "bd_id" to body["bd_id"]) "cm_ply_info" -> emptyMap - "qst_inf" -> qstInfHandler.handle(mapper.convert(body, BaseRequest::class.java)) - "pstd_h_ctrl" -> pstdHCtrlHandler.handle(mapper.convert(body, BaseRequest::class.java)) - "pstd_item_ng_lst" -> pstdItemNgLstHandler.handle(mapper.convert(body, BaseRequest::class.java)) + "qst_inf" -> mapOf("qi_lut" to DivaTime.now, "qhi_str" to null, "qrai_str" to null) + "pstd_h_ctrl" -> mapOf("p_std_hc_lut" to DivaTime.now, "p_std_hc_str" to "***,***") + "pstd_item_ng_lst" -> mapOf("p_std_i_n_lut" to DivaTime.now, "p_std_i_ie_n_lst" to "***", "p_std_i_se_n_lst" to "***") "shop_catalog" -> shopCatalogHandler.handle(mapper.convert(body, BaseRequest::class.java)) - "cstmz_itm_ctlg" -> cstmzItmCtlgHandler.handle(mapper.convert(body, BaseRequest::class.java)) + "cstmz_itm_ctlg" -> mapOf( + "cstmz_itm_ctlg_lut" to DivaTime.now, + "cstmz_itm_ctlg" to encode(db.g.customize.findAll().map { it.toInternal() }.joinToString(",") { encode(it) }) + ) "card_procedure" -> cardProcedureHandler.handle(mapper.convert(body, CardProcedureRequest::class.java)) "registration" -> registrationHandler.handle(mapper.convert(body, RegistrationRequest::class.java)) diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/BannerDataHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/BannerDataHandler.kt deleted file mode 100644 index 5d05d374..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/BannerDataHandler.kt +++ /dev/null @@ -1,19 +0,0 @@ -package icu.samnyan.aqua.sega.diva.handler.databank - -import icu.samnyan.aqua.sega.diva.model.request.databank.BannerDataRequest -import icu.samnyan.aqua.sega.diva.model.response.databank.BannerDataResponse -import org.springframework.stereotype.Component -import java.time.LocalDateTime - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -class BannerDataHandler { - fun handle(request: BannerDataRequest) = BannerDataResponse( - LocalDateTime.now(), - "***", - "***", - request.bd_id - ) -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/BannerInfoHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/BannerInfoHandler.kt deleted file mode 100644 index 39c6b492..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/BannerInfoHandler.kt +++ /dev/null @@ -1,19 +0,0 @@ -package icu.samnyan.aqua.sega.diva.handler.databank - -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest -import icu.samnyan.aqua.sega.diva.model.response.databank.BannerInfoResponse -import org.springframework.stereotype.Component - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -class BannerInfoHandler { - fun handle(request: BaseRequest) = BannerInfoResponse( - null, - null, - null, - null, - null - ) -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/CstmzItmCtlgHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/CstmzItmCtlgHandler.kt deleted file mode 100644 index 35a8fb91..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/CstmzItmCtlgHandler.kt +++ /dev/null @@ -1,24 +0,0 @@ -package icu.samnyan.aqua.sega.diva.handler.databank - -import icu.samnyan.aqua.sega.diva.DivaCustomizeRepository -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest -import icu.samnyan.aqua.sega.diva.model.response.databank.CstmzItmCtlgResponse -import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil -import icu.samnyan.aqua.sega.diva.util.URIEncoder.encode -import org.springframework.stereotype.Component -import java.time.LocalDateTime - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -class CstmzItmCtlgHandler(private val customizeRepository: DivaCustomizeRepository) { - fun handle(request: BaseRequest): Any { - val customizeList = customizeRepository.findAll() - - return CstmzItmCtlgResponse( - DivaDateTimeUtil.getString(LocalDateTime.now()), - encode(customizeList.map { it.toInternal() }.joinToString(",") { encode(it) }) - ) - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PstdHCtrlHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PstdHCtrlHandler.kt deleted file mode 100644 index 62f60f30..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PstdHCtrlHandler.kt +++ /dev/null @@ -1,18 +0,0 @@ -package icu.samnyan.aqua.sega.diva.handler.databank - -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest -import icu.samnyan.aqua.sega.diva.model.response.databank.PstdHCtrlResponse -import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil -import org.springframework.stereotype.Component -import java.time.LocalDateTime - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -class PstdHCtrlHandler { - fun handle(request: BaseRequest) = PstdHCtrlResponse( - DivaDateTimeUtil.getString(LocalDateTime.now()), - "***,***" - ) -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PstdItemNgLstHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PstdItemNgLstHandler.kt deleted file mode 100644 index 70961fcc..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PstdItemNgLstHandler.kt +++ /dev/null @@ -1,19 +0,0 @@ -package icu.samnyan.aqua.sega.diva.handler.databank - -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest -import icu.samnyan.aqua.sega.diva.model.response.databank.PstdItemNgLstResponse -import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil -import org.springframework.stereotype.Component -import java.time.LocalDateTime - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -class PstdItemNgLstHandler { - fun handle(request: BaseRequest) = PstdItemNgLstResponse( - DivaDateTimeUtil.getString(LocalDateTime.now()), - "***", - "***" - ) -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/QstInfHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/QstInfHandler.kt deleted file mode 100644 index 323baf4e..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/QstInfHandler.kt +++ /dev/null @@ -1,19 +0,0 @@ -package icu.samnyan.aqua.sega.diva.handler.databank - -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest -import icu.samnyan.aqua.sega.diva.model.response.databank.QstInfResponse -import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil -import org.springframework.stereotype.Component -import java.time.LocalDateTime - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -class QstInfHandler { - fun handle(request: BaseRequest) = QstInfResponse( - DivaDateTimeUtil.getString(LocalDateTime.now()), - null, - null - ) -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/RmtWpLstHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/RmtWpLstHandler.kt deleted file mode 100644 index 8bf0ccf7..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/RmtWpLstHandler.kt +++ /dev/null @@ -1,18 +0,0 @@ -package icu.samnyan.aqua.sega.diva.handler.databank - -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest -import icu.samnyan.aqua.sega.diva.model.response.databank.RmtWpLstResponse -import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil -import org.springframework.stereotype.Component -import java.time.LocalDateTime - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -class RmtWpLstHandler { - fun handle(request: BaseRequest) = RmtWpLstResponse( - DivaDateTimeUtil.getString(LocalDateTime.now()), - "***" - ) -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/GetPvPdHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/GetPvPdHandler.kt index 167989fd..f9d45ee3 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/GetPvPdHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/GetPvPdHandler.kt @@ -7,10 +7,9 @@ import icu.samnyan.aqua.sega.diva.model.request.ingame.GetPvPdRequest import icu.samnyan.aqua.sega.diva.model.response.ingame.GetPvPdResponse import icu.samnyan.aqua.sega.diva.model.userdata.PlayerPvCustomize import icu.samnyan.aqua.sega.diva.model.userdata.PlayerPvRecord -import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil +import icu.samnyan.aqua.sega.diva.util.DivaTime import icu.samnyan.aqua.sega.diva.util.URIEncoder.encode import org.springframework.stereotype.Component -import java.time.LocalDateTime import java.util.function.Supplier /** @@ -93,7 +92,7 @@ class GetPvPdHandler(val db: DivaRepos) { return GetPvPdResponse( pd.toString(), false, - DivaDateTimeUtil.getString(LocalDateTime.now()) + DivaTime.now ) } diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/Const.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/Const.java index e1c1d812..4b189c11 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/Const.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/Const.java @@ -5,7 +5,6 @@ package icu.samnyan.aqua.sega.diva.model.common; */ public class Const { public final static String ALL_NOT_HAVE = "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"; - public final static String ALL_NOT_HAVE_TEST = "0"; public final static String ALL_HAVE = "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"; public final static String NULL_QUEST = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"; } diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/FestaCollection.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/FestaCollection.java index 5e05c112..ea70ebb0 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/FestaCollection.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/FestaCollection.java @@ -1,7 +1,7 @@ package icu.samnyan.aqua.sega.diva.model.common.collection; import icu.samnyan.aqua.sega.diva.model.gamedata.Festa; -import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil; +import icu.samnyan.aqua.sega.diva.util.DivaTime; import icu.samnyan.aqua.sega.diva.util.URIEncoder; import lombok.Data; @@ -66,14 +66,14 @@ public class FestaCollection { } public String getStarts() { - return DivaDateTimeUtil.getString(this.firstFesta.getStart()) + "," + DivaDateTimeUtil.getString(this.secondFesta.getStart()); + return DivaTime.getString(this.firstFesta.getStart()) + "," + DivaTime.getString(this.secondFesta.getStart()); } public String getEnds() { - return DivaDateTimeUtil.getString(this.firstFesta.getEnd()) + "," + DivaDateTimeUtil.getString(this.secondFesta.getEnd()); + return DivaTime.getString(this.firstFesta.getEnd()) + "," + DivaTime.getString(this.secondFesta.getEnd()); } public String getLastUpdateTime() { - return DivaDateTimeUtil.getString(this.firstFesta.getCreateDate().isBefore(this.secondFesta.getCreateDate()) ? this.firstFesta.getCreateDate() : this.secondFesta.getCreateDate()); + return DivaTime.getString(this.firstFesta.getCreateDate().isBefore(this.secondFesta.getCreateDate()) ? this.firstFesta.getCreateDate() : this.secondFesta.getCreateDate()); } } diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Contest.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Contest.java index 1af5f2b5..580d20ef 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Contest.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Contest.java @@ -2,7 +2,7 @@ package icu.samnyan.aqua.sega.diva.model.gamedata; import icu.samnyan.aqua.sega.diva.model.common.ContestLeague; import icu.samnyan.aqua.sega.diva.model.common.ContestNormaType; -import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil; +import icu.samnyan.aqua.sega.diva.util.DivaTime; import icu.samnyan.aqua.sega.diva.util.URIEncoder; import jakarta.persistence.*; import lombok.AllArgsConstructor; @@ -85,8 +85,8 @@ public class Contest implements Serializable { public String getString() { List list = new LinkedList<>(); list.add(this.id); // Contest ID - list.add(DivaDateTimeUtil.format(this.startTime)); // Start time - list.add(DivaDateTimeUtil.format(this.endTime)); // End time + list.add(DivaTime.format(this.startTime)); // Start time + list.add(DivaTime.format(this.endTime)); // End time list.add(URIEncoder.encode(this.name)); // Contest name list.add(URIEncoder.encode(this.description)); // Contest description list.add(this.league.getValue()); // Contest league diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaCustomize.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaCustomize.java index dab0496a..9ceb23f3 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaCustomize.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaCustomize.java @@ -1,7 +1,7 @@ package icu.samnyan.aqua.sega.diva.model.gamedata; import icu.samnyan.aqua.sega.diva.model.Internalizable; -import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil; +import icu.samnyan.aqua.sega.diva.util.DivaTime; import icu.samnyan.aqua.sega.diva.util.URIEncoder; import jakarta.persistence.Entity; import jakarta.persistence.Id; @@ -43,8 +43,8 @@ public class DivaCustomize implements Serializable, Internalizable { return id + ",0," + URIEncoder.encode(name) + "," + price + "," + - DivaDateTimeUtil.format(releaseDate) + "," + - DivaDateTimeUtil.format(endDate) + "," + + DivaTime.format(releaseDate) + "," + + DivaTime.format(endDate) + "," + sortOrder; } } diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaModule.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaModule.java index d38fb844..717dea32 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaModule.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaModule.java @@ -1,7 +1,7 @@ package icu.samnyan.aqua.sega.diva.model.gamedata; import icu.samnyan.aqua.sega.diva.model.Internalizable; -import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil; +import icu.samnyan.aqua.sega.diva.util.DivaTime; import icu.samnyan.aqua.sega.diva.util.URIEncoder; import jakarta.persistence.Entity; import jakarta.persistence.Id; @@ -43,8 +43,8 @@ public class DivaModule implements Serializable, Internalizable { return id + ",0," + URIEncoder.encode(name) + "," + price + "," + - DivaDateTimeUtil.format(releaseDate) + "," + - DivaDateTimeUtil.format(endDate) + "," + + DivaTime.format(releaseDate) + "," + + DivaTime.format(endDate) + "," + sortOrder; } } diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/databank/BannerDataRequest.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/request/databank/BannerDataRequest.java deleted file mode 100644 index c88dec0e..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/databank/BannerDataRequest.java +++ /dev/null @@ -1,18 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.request.databank; - -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -public class BannerDataRequest extends BaseRequest { - private int bd_id; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/boot/AttendResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/boot/AttendResponse.java deleted file mode 100644 index f95c2226..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/boot/AttendResponse.java +++ /dev/null @@ -1,25 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.response.boot; - -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -public class AttendResponse { - private String atnd_prm1; - private String atnd_prm2; - private String atnd_prm3; - private LocalDateTime atnd_lut; - - public AttendResponse(String atnd_prm1, String atnd_prm2, String atnd_prm3, LocalDateTime atnd_lut) { - this.atnd_prm1 = atnd_prm1; - this.atnd_prm2 = atnd_prm2; - this.atnd_prm3 = atnd_prm3; - this.atnd_lut = atnd_lut; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/BannerDataResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/BannerDataResponse.java deleted file mode 100644 index e9526e5b..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/BannerDataResponse.java +++ /dev/null @@ -1,26 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.response.databank; - -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -public class BannerDataResponse { - private LocalDateTime bd_ut; - private String bd_ti; - private String bd_hs; - private int bd_id; - - public BannerDataResponse(LocalDateTime bd_ut, String bd_ti, String bd_hs, int bd_id) { - this.bd_ut = bd_ut; - this.bd_ti = bd_ti; - this.bd_hs = bd_hs; - this.bd_id = bd_id; - } -} - diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/BannerInfoResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/BannerInfoResponse.java deleted file mode 100644 index 91b45bc7..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/BannerInfoResponse.java +++ /dev/null @@ -1,26 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.response.databank; - -import lombok.Getter; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -public class BannerInfoResponse { - private String bi_lut; - // Array of 10 - private String bi_id; - private String bi_st; - private String bi_et; - private String bi_ut; - - public BannerInfoResponse(String bi_lut, String bi_id, String bi_st, String bi_et, String bi_ut) { - this.bi_lut = bi_lut; - this.bi_id = bi_id; - this.bi_st = bi_st; - this.bi_et = bi_et; - this.bi_ut = bi_ut; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/CstmzItmCtlgResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/CstmzItmCtlgResponse.java deleted file mode 100644 index 1db81c15..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/CstmzItmCtlgResponse.java +++ /dev/null @@ -1,19 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.response.databank; - -import lombok.Getter; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -public class CstmzItmCtlgResponse { - private String cstmz_itm_ctlg_lut; - private String cstmz_itm_ctlg; - - public CstmzItmCtlgResponse(String cstmz_itm_ctlg_lut, String cstmz_itm_ctlg) { - this.cstmz_itm_ctlg_lut = cstmz_itm_ctlg_lut; - this.cstmz_itm_ctlg = cstmz_itm_ctlg; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PstdHCtrlResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PstdHCtrlResponse.java deleted file mode 100644 index 1480e664..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PstdHCtrlResponse.java +++ /dev/null @@ -1,19 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.response.databank; - -import lombok.Getter; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -public class PstdHCtrlResponse { - private String p_std_hc_lut; - private String p_std_hc_str; - - public PstdHCtrlResponse(String p_std_hc_lut, String p_std_hc_str) { - this.p_std_hc_lut = p_std_hc_lut; - this.p_std_hc_str = p_std_hc_str; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PstdItemNgLstResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PstdItemNgLstResponse.java deleted file mode 100644 index f48dfbfe..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PstdItemNgLstResponse.java +++ /dev/null @@ -1,21 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.response.databank; - -import lombok.Getter; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -public class PstdItemNgLstResponse { - private String p_std_i_n_lut; - private String p_std_i_ie_n_lst; - private String p_std_i_se_n_lst; - - public PstdItemNgLstResponse(String p_std_i_n_lut, String p_std_i_ie_n_lst, String p_std_i_se_n_lst) { - this.p_std_i_n_lut = p_std_i_n_lut; - this.p_std_i_ie_n_lst = p_std_i_ie_n_lst; - this.p_std_i_se_n_lst = p_std_i_se_n_lst; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/QstInfResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/QstInfResponse.java deleted file mode 100644 index d059c67d..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/QstInfResponse.java +++ /dev/null @@ -1,21 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.response.databank; - -import lombok.Getter; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -public class QstInfResponse { - private String qi_lut; - private String qhi_str; - private String qrai_str; - - public QstInfResponse(String qi_lut, String qhi_str, String qrai_str) { - this.qi_lut = qi_lut; - this.qhi_str = qhi_str; - this.qrai_str = qrai_str; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/RmtWpLstResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/RmtWpLstResponse.java deleted file mode 100644 index b9f16cef..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/RmtWpLstResponse.java +++ /dev/null @@ -1,19 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.response.databank; - -import lombok.Getter; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -public class RmtWpLstResponse { - private String rwl_lut; - private String rw_lst; - - public RmtWpLstResponse(String rwl_lut, String rw_lst) { - this.rwl_lut = rwl_lut; - this.rw_lst = rw_lst; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/util/DivaUtils.kt b/src/main/java/icu/samnyan/aqua/sega/diva/util/DivaUtils.kt index 61e4bdf1..561d477a 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/util/DivaUtils.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/util/DivaUtils.kt @@ -19,10 +19,11 @@ object DivaStringUtils { fun getDummyString(content: String, length: Int) = "$content,".repeat(length).removeSuffix(",") } -object DivaDateTimeUtil { +object DivaTime { + val now get() = getString(LocalDateTime.now()) + @JvmStatic - fun getString(time: LocalDateTime) = - URIEncoder.encode(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.0").format(time)) + fun getString(time: LocalDateTime) = URIEncoder.encode(format(time)) @JvmStatic fun format(time: LocalDateTime) = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.0").format(time) @@ -30,7 +31,7 @@ object DivaDateTimeUtil { class DivaDateTimeSerializer(t: Class? = null) : StdSerializer(t) { override fun serialize(value: LocalDateTime, gen: JsonGenerator, provider: SerializerProvider) { - gen.writeString(DivaDateTimeUtil.getString(value)) + gen.writeString(DivaTime.getString(value)) } }