Team.thewar
/
thewar_server
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

네이밍 규칙 변경으로 인한 업데이트

This commit is contained in:
김민서 2024-02-27 11:09:17 +09:00
parent bbdeca0db2
commit 584e47be4e
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Server/Git/AbstractGit.cs
View File

@ -11,7 +11,7 @@ namespace Server.Git
public bool isRestart; public bool isRestart;
string _repositoryPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "excel"); string _repositoryPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "excel");
public List<sheet> sheets; public List<Sheet> sheets;
public string repositoryPath { get { return _repositoryPath; } } public string repositoryPath { get { return _repositoryPath; } }

12
Server/Git/ExcelManager.cs
View File

@ -3,7 +3,7 @@ using NLog;
namespace Server.Git namespace Server.Git
{ {
public class sheet public class Sheet
{ {
string _name; string _name;
public string name { get { return _name; } } public string name { get { return _name; } }
@ -16,7 +16,7 @@ namespace Server.Git
Dictionary<long, Dictionary<string, object>> _dicViewer; Dictionary<long, Dictionary<string, object>> _dicViewer;
public Dictionary<long, Dictionary<string, object>> dicViewer { get { return _dicViewer; } } public Dictionary<long, Dictionary<string, object>> dicViewer { get { return _dicViewer; } }
public sheet(string name, List<string> variable, List<string> dataEnum, List<string> type, Dictionary<long, Dictionary<string, object>> dicViewer) public Sheet(string name, List<string> variable, List<string> dataEnum, List<string> type, Dictionary<long, Dictionary<string, object>> dicViewer)
{ {
this._name = name; this._name = name;
this._variable = variable; this._variable = variable;
@ -29,9 +29,9 @@ namespace Server.Git
{ {
private static readonly NLog.ILogger logger = LogManager.GetCurrentClassLogger(); private static readonly NLog.ILogger logger = LogManager.GetCurrentClassLogger();
List<sheet> _sheets; List<Sheet> _sheets;
public List<sheet> sheets { get { return _sheets; } } public List<Sheet> sheets { get { return _sheets; } }
string _pathFile; string _pathFile;
public ExcelManager(string path, string file = "") public ExcelManager(string path, string file = "")
@ -54,7 +54,7 @@ namespace Server.Git
// 모든 워크시트 가져오기 // 모든 워크시트 가져오기
WorksheetCollection collection = wb.Worksheets; WorksheetCollection collection = wb.Worksheets;
_sheets = new List<sheet>(); _sheets = new List<Sheet>();
// 모든 워크시트 반복 // 모든 워크시트 반복
try try
@ -95,7 +95,7 @@ namespace Server.Git
} }
dicViewer.Add((int)(isIndex ? worksheet.Cells[n, 0].Value : n - 4), dataList); 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); _sheets.Add(sheet);
} }
} }

4
Server/Git/ExcelSQL.cs
View File

@ -10,9 +10,9 @@ namespace Server.Git
private static readonly NLog.ILogger logger = LogManager.GetCurrentClassLogger(); private static readonly NLog.ILogger logger = LogManager.GetCurrentClassLogger();
List<sheet> sheets; List<Sheet> sheets;
public ExcelSQL(List<sheet> sheets) public ExcelSQL(List<Sheet> sheets)
{ {
this.sheets = sheets; this.sheets = sheets;
} }

8
Server/Git/XlsxToJson.cs
View File

@ -11,7 +11,7 @@ namespace Server.Git
List<string> fileList = GetFiles(repositoryPath, ".xlsx"); List<string> fileList = GetFiles(repositoryPath, ".xlsx");
Dictionary<string, Dictionary<long, Dictionary<string, object>>> clientSheetList = new Dictionary<string, Dictionary<long, Dictionary<string, object>>>(); Dictionary<string, Dictionary<long, Dictionary<string, object>>> clientSheetList = new Dictionary<string, Dictionary<long, Dictionary<string, object>>>();
List<sheet> serverSheetList = new List<sheet>(); List<Sheet> serverSheetList = new List<Sheet>();
for (int n = 0; n < fileList.Count; n++) for (int n = 0; n < fileList.Count; n++)
{ {
@ -21,14 +21,14 @@ namespace Server.Git
sheets = em.sheets; sheets = em.sheets;
for (int m = 0; m < sheets.Count; m++) for (int m = 0; m < sheets.Count; m++)
{ {
Sheet sheet = sheets[m];
switch (sheets[m].dataEnum[0]) switch (sheets[m].dataEnum[0])
{ {
case "server": case "server":
serverSheetList.Add(sheets[m]); serverSheetList.Add(sheet);
break; break;
case "client": case "client":
clientSheetList.Add(sheets[m].name, sheets[m].dicViewer); clientSheetList.Add(sheet.name, sheet.dicViewer);
break; break;
case "all": case "all":
//수정할것 이렇게 작업되면 데이터가 2개로 나눠지는것이 아닌 한개의 데이터가 중복으로 제거됨. //수정할것 이렇게 작업되면 데이터가 2개로 나눠지는것이 아닌 한개의 데이터가 중복으로 제거됨.

2
Server/SQL/EquipmentData.cs
View File

@ -25,7 +25,7 @@ namespace Server.SQL
{ {
return equipmentData.Values.ToList(); return equipmentData.Values.ToList();
} }
public void init(sheet data) public void init(Sheet data)
{ {
this.equipmentData = new Dictionary<long, EquipmentData>(); this.equipmentData = new Dictionary<long, EquipmentData>();
foreach (var item in data.dicViewer) foreach (var item in data.dicViewer)