diff --git a/Server/Git/ExcelSQL.cs b/Server/Git/ExcelSQL.cs index 384cf7b..1d85764 100644 --- a/Server/Git/ExcelSQL.cs +++ b/Server/Git/ExcelSQL.cs @@ -44,9 +44,6 @@ namespace Server.Git query = ""; for (int n = 0; n < sheets.Count; n++) { - if (sheets[n].dataEnum[0] == "client") - continue; - //초기화 newTableQuery = ""; tableDatas = "("; diff --git a/Server/Git/XlsxToJson.cs b/Server/Git/XlsxToJson.cs index f64f7a0..2bbd85f 100644 --- a/Server/Git/XlsxToJson.cs +++ b/Server/Git/XlsxToJson.cs @@ -11,6 +11,7 @@ namespace Server.Git List fileList = GetFiles(repositoryPath, ".xlsx"); Dictionary>> clientSheetList = new Dictionary>>(); + List serverSheetList = new List(); for (int n = 0; n < fileList.Count; n++) { @@ -21,25 +22,40 @@ namespace Server.Git for (int m = 0; m < sheets.Count; m++) { - if (sheets[m].dataEnum[0] == "server") - continue; - string name = sheets[m].name; - Dictionary> sheet = sheets[m].dicViewer; - - - for(int i = 1; i < sheets[m].dataEnum.Count; i++) + switch (sheets[m].dataEnum[0]) { - if(sheets[m].dataEnum[i] == "server") - { - foreach(var item in sheet) + case "server": + serverSheetList.Add(sheets[m]); + break; + case "client": + clientSheetList.Add(sheets[m].name, sheets[m].dicViewer); + break; + case "all": + string name = sheets[m].name; + Dictionary> serverSheet = sheets[m].dicViewer; + Dictionary> clientSheet = sheets[m].dicViewer; + for (int i = 1; i < sheets[m].dataEnum.Count; i++) { - item.Value.Remove(sheets[m].variable[i]); + if (sheets[m].dataEnum[i] == "client") + { + foreach (var item in serverSheet) + { + item.Value.Remove(sheets[m].variable[i]); + } + } + if (sheets[m].dataEnum[i] == "server") + { + foreach (var item in clientSheet) + { + item.Value.Remove(sheets[m].variable[i]); + } + } + } - } + serverSheetList.Add(sheets[m]); + clientSheetList.Add(name, clientSheet); + break; } - - clientSheetList.Add(name, sheet); - } } else @@ -50,9 +66,9 @@ namespace Server.Git } //현재 서버는 PostgreSQL기준으로 쿼리를 생성하는 코드와 패키지가 세팅되어 있습니다 이점 참고바랍니다 //추가로 해당 기능을 사용하려면 서버에 excel이라는 스키마가 존재하여야 합니다. - if (sheets != null) + if (sheets != null && serverSheetList.Count != 0) { - ExcelSQL sql = new ExcelSQL(sheets); + ExcelSQL sql = new ExcelSQL(serverSheetList); sql.DataUpdate(); } return JsonConvert.SerializeObject(clientSheetList); diff --git a/Server/Program.cs b/Server/Program.cs index d4a883b..8e4fdbd 100644 --- a/Server/Program.cs +++ b/Server/Program.cs @@ -8,20 +8,20 @@ var app = builder.Build(); // ʱȭ ProtocolProcessor.Init(); // ʱȭ -GItWebhook.Init(); +//GItWebhook.Init(); -//http -app.MapPost("/", ProtocolProcessor.Process); +////http +//app.MapPost("/", ProtocolProcessor.Process); -//git ٿ -app.MapPost("/git", GItWebhook.Process); +////git ٿ +//app.MapPost("/git", GItWebhook.Process); -//app.MapPost("/update", GItWebhook.Process); +////app.MapPost("/update", GItWebhook.Process); -#if DEBUG -app.MapGet("/spin", Spin.Main); +//#if DEBUG +//app.MapGet("/spin", Spin.Main); -app.MapPost("/spin/random", Spin.Random); -#endif +//app.MapPost("/spin/random", Spin.Random); +//#endif app.Run(Statics.URL);