From 255339a9ef79137f190e48ab489531d56c6b5e01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=8C=90=EB=8F=8C?= Date: Wed, 13 Dec 2023 21:59:47 +0900 Subject: [PATCH] =?UTF-8?q?=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/SQL/{LeaderInfo.cs => DeckInfo.cs} | 12 +++--- Server/SQL/DynamicData.cs | 5 +++ Server/Service/ChageDeck.cs | 2 +- Server/Service/Login.cs | 49 ++++++++++++----------- Server/System/Enums.cs | 1 + Server/System/Statics.cs | 4 +- 6 files changed, 40 insertions(+), 33 deletions(-) rename Server/SQL/{LeaderInfo.cs => DeckInfo.cs} (74%) diff --git a/Server/SQL/LeaderInfo.cs b/Server/SQL/DeckInfo.cs similarity index 74% rename from Server/SQL/LeaderInfo.cs rename to Server/SQL/DeckInfo.cs index 5fa9517..2475dcd 100644 --- a/Server/SQL/LeaderInfo.cs +++ b/Server/SQL/DeckInfo.cs @@ -5,11 +5,11 @@ using static System.Runtime.InteropServices.JavaScript.JSType; namespace Server.SQL { - [Table("leader_info", Schema = "gamedb")] - public class LeaderInfo + [Table("deck_info", Schema = "gamedb")] + public class DeckInfo { public int id { get; set; } - public int leader_id { get; set; } + public int deck_type { get; set; } public int deck_unit0_id { get; set; } public int deck_unit1_id { get; set; } public int deck_unit2_id { get; set; } @@ -22,11 +22,11 @@ namespace Server.SQL public int user_id { get; set; } } - public class LeaderInfoSQL : SQL + public class DeckInfoSQL : SQL { - public override DbSet table { get; set; } + public override DbSet table { get; set; } - public override List SelectUid(int user_id) + public override List SelectUid(int user_id) { return table.Where(data => data.user_id == user_id).ToList(); } diff --git a/Server/SQL/DynamicData.cs b/Server/SQL/DynamicData.cs index 0012ab7..cbf746c 100644 --- a/Server/SQL/DynamicData.cs +++ b/Server/SQL/DynamicData.cs @@ -38,5 +38,10 @@ namespace Server.SQL SaveChanges(); } } + + public override List SelectUid(int user_id) + { + return null;//table.Where(data => data.id == user_id).ToList(); + } } } diff --git a/Server/Service/ChageDeck.cs b/Server/Service/ChageDeck.cs index 26ba1f3..8ab955e 100644 --- a/Server/Service/ChageDeck.cs +++ b/Server/Service/ChageDeck.cs @@ -11,7 +11,7 @@ namespace Server.Service return makeResp(); } - public override Protocol ProtocolValue() => Protocol.Test; + public override Protocol ProtocolValue() => Protocol.ChangeDeck; public override Req Requst(string json) { diff --git a/Server/Service/Login.cs b/Server/Service/Login.cs index 2e05211..58fda59 100644 --- a/Server/Service/Login.cs +++ b/Server/Service/Login.cs @@ -11,11 +11,11 @@ namespace Server.Service { UserSQL userSql = new UserSQL(); DeckUnitInfoSQL deckUnitInfoSQL = new DeckUnitInfoSQL(); - LeaderInfoSQL leaderInfoSQL = new LeaderInfoSQL(); + DeckInfoSQL deckInfoSQL = new DeckInfoSQL(); EquipmentrSQL equipmentrSQL = new EquipmentrSQL(); User user; List deckUnitInfoList = null; - List leaderInfoList = null; + List deckInfoList = null; List equipmentList = null; Console.WriteLine(req.uuid); if (req.uuid == "") @@ -27,7 +27,7 @@ namespace Server.Service if (user != null) { deckUnitInfoList = deckUnitInfoSQL.Select(); - leaderInfoList = leaderInfoSQL.Select(); + deckInfoList = deckInfoSQL.Select(); } } else @@ -36,7 +36,8 @@ namespace Server.Service user = userSql.SelectUuid(req.uuid); deckUnitInfoList = deckUnitInfoSQL.SelectUid(user.id); - leaderInfoList = leaderInfoSQL.SelectUid(user.id); + //추후 이것을 1개만 보낼것. + deckInfoList = deckInfoSQL.SelectUid(user.id); equipmentList = equipmentrSQL.SelectUid(user.id); } if(user == null) @@ -94,28 +95,28 @@ namespace Server.Service deckUnitInfoSQL.Insert(deckUnitInfoList); #endregion #region 신규 덱 추가 - leaderInfoList = new List(); - LeaderInfo leaderInfo; - leaderInfo = new LeaderInfo(); - leaderInfo.user_id= user.id; - leaderInfo.leader_id = 1; - leaderInfo.deck_unit0_id = deckUnitInfoList[0].id; - leaderInfo.deck_unit1_id = deckUnitInfoList[1].id; - leaderInfo.deck_unit2_id = deckUnitInfoList[2].id; - leaderInfo.deck_unit3_id = deckUnitInfoList[3].id; - leaderInfo.deck_unit4_id = deckUnitInfoList[4].id; - leaderInfo.deck_unit5_id = deckUnitInfoList[5].id; - leaderInfo.deck_unit6_id = deckUnitInfoList[6].id; - leaderInfo.deck_unit7_id = deckUnitInfoList[7].id; - leaderInfo.deck_unit8_id = deckUnitInfoList[8].id; - leaderInfoList.Add(leaderInfo); - leaderInfoSQL.Insert(leaderInfoList); + deckInfoList = new List(); + DeckInfo deckInfo; + deckInfo = new DeckInfo(); + deckInfo.user_id= user.id; + deckInfo.deck_type = 1; + deckInfo.deck_unit0_id = deckUnitInfoList[0].id; + deckInfo.deck_unit1_id = deckUnitInfoList[1].id; + deckInfo.deck_unit2_id = deckUnitInfoList[2].id; + deckInfo.deck_unit3_id = deckUnitInfoList[3].id; + deckInfo.deck_unit4_id = deckUnitInfoList[4].id; + deckInfo.deck_unit5_id = deckUnitInfoList[5].id; + deckInfo.deck_unit6_id = deckUnitInfoList[6].id; + deckInfo.deck_unit7_id = deckUnitInfoList[7].id; + deckInfo.deck_unit8_id = deckUnitInfoList[8].id; + deckInfoList.Add(deckInfo); + deckInfoSQL.Insert(deckInfoList); #endregion } - return makeResp(user, deckUnitInfoList, leaderInfoList, equipmentList); + return makeResp(user, deckUnitInfoList, deckInfoList, equipmentList); } public override Protocol ProtocolValue() => Protocol.Login; @@ -126,13 +127,13 @@ namespace Server.Service return req; } - private string makeResp(User user, List deck_unit, List leader, List equipment) + private string makeResp(User user, List deck_unit, List deck_info, List equipment) { LoginResp resp = new LoginResp(); resp.nickname = user.nickname; resp.uuid = user.uuid; resp.deck_unit = deck_unit; - resp.leader = leader; + resp.deck_info = deck_info; resp.equipment = equipment; resp.status = 200; return resp.ToJson(); @@ -158,7 +159,7 @@ namespace Server.Service public string uuid; public string nickname; public List deck_unit; - public List leader; + public List deck_info; public List equipment; } } diff --git a/Server/System/Enums.cs b/Server/System/Enums.cs index 3f8904d..bcda68d 100644 --- a/Server/System/Enums.cs +++ b/Server/System/Enums.cs @@ -10,6 +10,7 @@ Downlode = 100,//기획 데이터 다운로드 Login = 101,//기획 데이터 다운로드 + ChangeDeck = 102,//기획 데이터 다운로드 } public enum Error diff --git a/Server/System/Statics.cs b/Server/System/Statics.cs index 1b20401..7232b30 100644 --- a/Server/System/Statics.cs +++ b/Server/System/Statics.cs @@ -7,8 +7,8 @@ public static readonly string EXCEL_SQL_URL = "Host=192.168.0.2;Port=5432;Username=manager;Password=Zn2zs558W5SdD8K;Database=project_thewar;"; public static readonly string remoteUrl = "https://manager:BQNl01bJJF0wn9R@gitea.pandoli365.com/Team.thewar/thewar_excel.git"; #elif LIVE - public static readonly string SQL_URL = "Host=192.168.0.2;Port=5432;Username=manager;Password=Zn2zs558W5SdD8K;Database=project_thewar_live;"; - public static readonly string EXCEL_SQL_URL = "Host=192.168.0.2;Port=5432;Username=manager;Password=Zn2zs558W5SdD8K;Database=project_thewar_live;"; + public static readonly string SQL_URL = "Host=192.168.0.2;Port=5432;Username=manager;Password=Zn2zs558W5SdD8K;Database=project_thewar;"; + public static readonly string EXCEL_SQL_URL = "Host=192.168.0.2;Port=5432;Username=manager;Password=Zn2zs558W5SdD8K;Database=project_thewar;"; public static readonly string remoteUrl = "https://manager:BQNl01bJJF0wn9R@gitea.pandoli365.com/Team.thewar/thewar_excel_live.git"; #endif