From 584e47be4e87cee8127447bacf9e728c6b1c6ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=9C?= Date: Tue, 27 Feb 2024 11:09:17 +0900 Subject: [PATCH] =?UTF-8?q?=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EA=B7=9C?= =?UTF-8?q?=EC=B9=99=20=EB=B3=80=EA=B2=BD=EC=9C=BC=EB=A1=9C=20=EC=9D=B8?= =?UTF-8?q?=ED=95=9C=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/Git/AbstractGit.cs | 2 +- Server/Git/ExcelManager.cs | 12 ++++++------ Server/Git/ExcelSQL.cs | 4 ++-- Server/Git/XlsxToJson.cs | 8 ++++---- Server/SQL/EquipmentData.cs | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Server/Git/AbstractGit.cs b/Server/Git/AbstractGit.cs index 6b3407e..a2c37e3 100644 --- a/Server/Git/AbstractGit.cs +++ b/Server/Git/AbstractGit.cs @@ -11,7 +11,7 @@ namespace Server.Git public bool isRestart; string _repositoryPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "excel"); - public List sheets; + public List sheets; public string repositoryPath { get { return _repositoryPath; } } diff --git a/Server/Git/ExcelManager.cs b/Server/Git/ExcelManager.cs index 932b35d..3f036c0 100644 --- a/Server/Git/ExcelManager.cs +++ b/Server/Git/ExcelManager.cs @@ -3,7 +3,7 @@ using NLog; namespace Server.Git { - public class sheet + public class Sheet { string _name; public string name { get { return _name; } } @@ -16,7 +16,7 @@ namespace Server.Git Dictionary> _dicViewer; public Dictionary> dicViewer { get { return _dicViewer; } } - public sheet(string name, List variable, List dataEnum, List type, Dictionary> dicViewer) + public Sheet(string name, List variable, List dataEnum, List type, Dictionary> dicViewer) { this._name = name; this._variable = variable; @@ -29,9 +29,9 @@ namespace Server.Git { private static readonly NLog.ILogger logger = LogManager.GetCurrentClassLogger(); - List _sheets; + List _sheets; - public List sheets { get { return _sheets; } } + public List sheets { get { return _sheets; } } string _pathFile; public ExcelManager(string path, string file = "") @@ -54,7 +54,7 @@ namespace Server.Git // 모든 워크시트 가져오기 WorksheetCollection collection = wb.Worksheets; - _sheets = new List(); + _sheets = new List(); // 모든 워크시트 반복 try @@ -95,7 +95,7 @@ namespace Server.Git } dicViewer.Add((int)(isIndex ? worksheet.Cells[n, 0].Value : n - 4), dataList); } - sheet sheet = new sheet(worksheet.Name, variable, dataEnum, type, dicViewer); + Sheet sheet = new Sheet(worksheet.Name, variable, dataEnum, type, dicViewer); _sheets.Add(sheet); } } diff --git a/Server/Git/ExcelSQL.cs b/Server/Git/ExcelSQL.cs index 30d74fe..f09d019 100644 --- a/Server/Git/ExcelSQL.cs +++ b/Server/Git/ExcelSQL.cs @@ -10,9 +10,9 @@ namespace Server.Git private static readonly NLog.ILogger logger = LogManager.GetCurrentClassLogger(); - List sheets; + List sheets; - public ExcelSQL(List sheets) + public ExcelSQL(List sheets) { this.sheets = sheets; } diff --git a/Server/Git/XlsxToJson.cs b/Server/Git/XlsxToJson.cs index 9a6e4b7..13013a8 100644 --- a/Server/Git/XlsxToJson.cs +++ b/Server/Git/XlsxToJson.cs @@ -11,7 +11,7 @@ namespace Server.Git List fileList = GetFiles(repositoryPath, ".xlsx"); Dictionary>> clientSheetList = new Dictionary>>(); - List serverSheetList = new List(); + List serverSheetList = new List(); for (int n = 0; n < fileList.Count; n++) { @@ -21,14 +21,14 @@ namespace Server.Git sheets = em.sheets; for (int m = 0; m < sheets.Count; m++) { - + Sheet sheet = sheets[m]; switch (sheets[m].dataEnum[0]) { case "server": - serverSheetList.Add(sheets[m]); + serverSheetList.Add(sheet); break; case "client": - clientSheetList.Add(sheets[m].name, sheets[m].dicViewer); + clientSheetList.Add(sheet.name, sheet.dicViewer); break; case "all": //수정할것 이렇게 작업되면 데이터가 2개로 나눠지는것이 아닌 한개의 데이터가 중복으로 제거됨. diff --git a/Server/SQL/EquipmentData.cs b/Server/SQL/EquipmentData.cs index c223cd1..95df5a3 100644 --- a/Server/SQL/EquipmentData.cs +++ b/Server/SQL/EquipmentData.cs @@ -25,7 +25,7 @@ namespace Server.SQL { return equipmentData.Values.ToList(); } - public void init(sheet data) + public void init(Sheet data) { this.equipmentData = new Dictionary(); foreach (var item in data.dicViewer)