From 6b92fea56533c6a490585432b51bcafc86fb318d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=8C=90=EB=8F=8C?= Date: Mon, 20 Nov 2023 21:14:38 +0900 Subject: [PATCH] =?UTF-8?q?=EC=97=91=EC=85=80=20to=20json=EC=99=84?= =?UTF-8?q?=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/Git/ExcelManager.cs | 34 +++++++--------------- Server/Git/XlsxToJson.cs | 19 ++++++------ Server/obj/Debug/net6.0/Server.dll | Bin 20480 -> 19968 bytes Server/obj/Debug/net6.0/Server.pdb | Bin 26888 -> 26980 bytes Server/obj/Debug/net6.0/ref/Server.dll | Bin 9216 -> 9216 bytes Server/obj/Debug/net6.0/refint/Server.dll | Bin 9216 -> 9216 bytes 6 files changed, 21 insertions(+), 32 deletions(-) diff --git a/Server/Git/ExcelManager.cs b/Server/Git/ExcelManager.cs index 0618cc7..7d861df 100644 --- a/Server/Git/ExcelManager.cs +++ b/Server/Git/ExcelManager.cs @@ -1,4 +1,5 @@ using Aspose.Cells; +using Microsoft.AspNetCore.Http; using NLog; namespace Server.Git @@ -14,10 +15,10 @@ namespace Server.Git public List variable { get { return _variable; } } List _type; public List type { get { return _type; } } - Dictionary> _dicViewer; - public Dictionary> dicViewer { get { return _dicViewer; } } + Dictionary> _dicViewer; + public Dictionary> dicViewer { get { return _dicViewer; } } - public sheet(string name, List variable, List type, Dictionary> dicViewer) + public sheet(string name, List variable, List type, Dictionary> dicViewer) { this._name = name; this._variable = variable; @@ -58,7 +59,7 @@ namespace Server.Git List variable = new List(); //변수 타입 List type = new List(); - Dictionary> dicViewer = new Dictionary>(); + Dictionary> dicViewer = new Dictionary>(); // 인덱스를 사용하여 워크시트 가져오기 Worksheet worksheet = collection[worksheetIndex]; @@ -70,33 +71,20 @@ namespace Server.Git //변수 이름과 타입 삽입 for (int n = 0; n <= horizontal; n++) { - // Console.Write(worksheet.Cells[i, j].Value + " | "); variable.Add((string)worksheet.Cells[0, n].Value); type.Add(((string)worksheet.Cells[2, n].Value).ToLower()); } + bool isIndex = variable[0] == "index"; + for (int n = 3; n <= vertical; n++) { - List dataList = new List(); + Dictionary dataList = new Dictionary(); for (int m = 0; m <= horizontal; m++) { - switch (type[m]) - { - case "enum": - case "int": - dataList.Add(worksheet.Cells[n, m].Value); - break; - case "string": - case "text": - case "time": - dataList.Add(worksheet.Cells[n, m].Value); - break; - default: - Console.WriteLine("알수없는 타입의 메세지 입니다."); - break; - } + dataList.Add(variable[m], worksheet.Cells[n, m].Value); } - dicViewer.Add(n, dataList); + dicViewer.Add((int)(isIndex ? worksheet.Cells[n, 0].Value : n - 3), dataList); } sheet sheet = new sheet(worksheet.Name, variable, type, dicViewer); _sheets.Add(sheet); @@ -111,4 +99,4 @@ namespace Server.Git return true; } } -} +} \ No newline at end of file diff --git a/Server/Git/XlsxToJson.cs b/Server/Git/XlsxToJson.cs index 2d9a96f..a2efcac 100644 --- a/Server/Git/XlsxToJson.cs +++ b/Server/Git/XlsxToJson.cs @@ -1,4 +1,7 @@ -namespace Server.Git +using Newtonsoft.Json; +using System.Collections.Generic; + +namespace Server.Git { public class XlsxToJson : AbstractGit { @@ -14,15 +17,13 @@ if (em.Play()) { List sheets = em.sheets; - - foreach (KeyValuePair> sheet in sheets[0].dicViewer) + Dictionary>> sheetList = new Dictionary>>(); + for (int n = 0; n < sheets.Count; n++) { - foreach (object obj in sheet.Value) - { - //이것을 기반으로 서버 테이블을 생성뒤 데이터를 세팅 - //Console.WriteLine(obj); - } + sheetList.Add(sheets[n].name, sheets[n].dicViewer); } + string test = JsonConvert.SerializeObject(sheetList); + Console.WriteLine(test); } else { @@ -38,4 +39,4 @@ } } -} +} \ No newline at end of file diff --git a/Server/obj/Debug/net6.0/Server.dll b/Server/obj/Debug/net6.0/Server.dll index 8d36b78a078e9d443998f953ea1af4337dec2f50..027c75c14c54ee311867f4d415efe1e931045a6a 100644 GIT binary patch delta 6457 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 F`~!PZ3#R}8 delta 1832 zcmZ`(eN0wm6hG&=m;2uPe(~}m9~uNCf+8SJ{0KrFSYUiu5}`mDh#we(6qz}*mn(vA zEmwNiA5H#Xwye2jDO$PJV$StJYb^$&long9k1cEUPa^B%_dM?_vbLVx^SkGF&UwDh zbDrn>Q4WvtONF7uZlZB)<7SWdU@T(4fuZr zUeE+y+TPg${^PEzi@SXt6&F*pFXzHSbic5O|_7_Aq7!=5&X(= z{KVz7gm_qGR4hb`>c)v1X$i8Ml(morQAgfT2EW23_EtdykTXc+=BX0< zS{IF%i>jW({{-KJ1>E-Ipy;9h@P}u4h)4!(o;5^x?Hn$5Dckc9ro&2?CBS51#e&A6 zYb5iiW7kA6Gyt^dCeW>PkJ7zLhY`J)-hiUf3gV7 zq!D`l;y_szOqOs(>|b}Ux1pbVVzb$ zkD-%5gFXYgNEVt&tw4*u0J_y=UWGpT4i-N>1tjW(usV4Sk+>%@RPTIgwQ;pm?7qHy z*fi+vhACiUdqp4^ar7}SoRA5jXRSE!$gScPLwH*yso!bfok*`#zWM?whI#Z1`Ej&zH z)8%83mu|TtqofHlNT~wljJ^Sx;B3@qf-rs3U^DIwFNGyb$85_CoL7oY9!fOaLgt^v z0j8xoa-OZjSL1kgWrTDyor(nRxmu2Ppwz(gv<*+CPL}^kyi&LO3DZTEaNn^6gsH-C zeRIq}Dj5RhlVeg;!yKN7jrBGrZQJa~F1jnTS?z%-q}8o8$Vb~Tl#9ypo8u{7por9J z0vSC$I&xO5oZgmlxt4<^T*y5q+4ix0itXR|NHHHd&%LqSTgl-m?i~`nXZh$1_f>LV zIJ0kD$S)+0{vm8Vk=y4XNd}U%!EeTqJ0vh|u1tqZ$2rAQ3(i4MCM`EHS0|H8n2e3& z;(^D5N;`1CVlPvYFl7KvP#ns_@?we2T9EE0MN$KcJjDKkLGC%v_7cOcV!O()FR*>V zz`3oNzpfwwe-}CDcCS8MZ9*scs+lRA!1vS>1(0XzwsSL5X mb0U%u5m(9-j6`H*V!-xzU$l6F@&Fge?FJ>J2wY@rfc^ze6bktO diff --git a/Server/obj/Debug/net6.0/ref/Server.dll b/Server/obj/Debug/net6.0/ref/Server.dll index 4730a471363dce0901105b9f6b8b4f9f61e9bb48..880925fc57f9b4b55d4f2d00930ced217aa38fb6 100644 GIT binary patch delta 2328 zcma);du$X{6vn@MXXfs*YWq1)A~_8#NTy1vUnX)ItaWq*X~Hu?Ve- zCTVUv5;beu9R;LXx;Az^w{8>Y+7|^( zx~E!OaDcR}^@7&yqjVp1K2Y7cxG6{j3PGdIQs`$sB%7@;wpcp8nj@R#_lCk|W0k3J zQ)(V#o?%YqcpK|+QulMjSU@$EN^_#roWXjrsr3uQ050L&eMSi1sSye_Kqt-%&Amc* zVWZ6o;X}^$%Vy_-uO|1t)d)d<5H^<3K-x)m8JcDzX}w$<56~?G0~Q1oPa>Bkr`S!W zWo1b#^ipNDXfiVhx$d@^cLC0Q!7hv-jbh`t*|gNGBN1ZTNy$Zskk`o|mqy9=($uy< zcTiOv zw$(=b(s%|+?Lr5Z^}M6j6T{Z}LZs8&K#|iz^B+so&w4k<_c8Zi18uA+s1>HD4q{ex zvED#4`w=hVer!Y+u|8<(+skAWwmTva&;4QUBz;QtV@VUO0o%*7^j3%>cVLV=G{%k1 z>2~>R)H-3jTjYFdu*jWNC%j%vY%9+?`vZxb9#*=;j*4yOV8KyEQBF_rWFeQIu2D4I zQ}hbvmofmKIzum~=bltw(^89<>A3++m~VblNDe@k`U(woH=fH6=pWNf!C|-a%J@W8 zqxuCUUIlK7-|1y=heeAsG(NN7Y1)sN7xQ;2`>x}~mU%h6sZ3FDoQu1;QTUv>!9-Z^ zrWd2xIUT`7mEN#&uMckJIo;}z+scdSR$m44kDy{qtAg|2F$Pg^v_FcR_pCRw%das1 zunLv_unLHRqnVW6b-1NIM#38pKhH;n@a!mbr%5l#OZY$Tin!n$FUjOm)?`st)Or>< zI>E4$4k>{f%C-glN^D!wFGfeMF&p%m=jtZb{d9~;yg@Y3M>MgID3Fiqh~Y-GmaZOf zIz#bXoGbGq=INu+C029KS_^#2x|b-?N;GhhXrk7t!di?&))I8u>Bm_?4B%eY(}^~n zGMe+4S?1%+70k8OeCr_UGdOF-FpLYdsl#}Ww)qmW&ZKa2x?9xK5&9}Ifwzb$%tbvN zibqJ##5LlB_>Gvx-^9n@m-T4j_)6kTM6uENBwUrNkXzACZMP!8d=^deFh>kA0j1Iq zQ4FA+bvx@G)`wl{>Yw-OGoAzyK delta 2321 zcma);Yitx%6vzMf&dg<5w%gg3ZMWUl6c@^>P=WHWDuG%GbOotGC4_*1MNA`siX{Xv z+1C0>#KiVOBM%cQ35qnax>1SoK~pS2F=F@xCPqSx!Pr357~&_-Jv+1A`pIeXoB#iu zbDuMNJ6$WgR=)X~{Z2#A;ogH);&07Ih?&j{Z9tWtCTHmlVvV?+JuTKtclOZE zg?9~nzUs@jAB&zny68|gV&4)Hm$Xo&PBIDzYOzSSs`<0;C?K)6b9ejBXPyUL$4da4 z?uoXwI6>MqdPQ5yGP)1x57nMb%od~pg^-nY6#AGC%T}itJ&uWQ=Ey#I%~IHBZMGH0 zq~ZI_3(Q#@-^zNjH2s{iR#Ht|8BUjm^{m&}M(-sCaTOQuwZgcn&QoX(OyV11cvzS& zT%?^aKIUwnY}MaSnwI&%X@HVHsyYUG-Ng~X)gOaNeA#ajJTv|fDo2K?6 zOgE*N%DD#|Dns)qydjO#>14aH`1>?b=Srjxsm-3f9@aLA+jWY;ORgXlUt@{ta^gCbuGLny-l>t2o@VID#UZLBS*6=tb+VvFcx z-9a<^8GEr1yU|I!KV+NReliNLY7s2Y{B6HZdRXvVQX^NQ`XA5lLR=uqys_A=*ef)!2f`NI8N|JM%azh(X-LdM=TUUuGk- zh50yh19M9a-`a`h3{E*w4C69w>M-7;ZN7?>o>9D}X}74OBlG|=Oy}@;KVBH};3P;vqEyp(!>rsMT`qSd-OquLKn%edt$b1%yOo5+&$I znsu6W7weNAO?HI!2xo7wzQG!jd+=x~6RZ=`=q95dkxjA^+hm#(X-9=B}dM?-Z?u%J7b5I9079c5}QadAn15nr7RSN-G2-xu(gOz)gY{{ktCXI%gQ diff --git a/Server/obj/Debug/net6.0/refint/Server.dll b/Server/obj/Debug/net6.0/refint/Server.dll index 4730a471363dce0901105b9f6b8b4f9f61e9bb48..880925fc57f9b4b55d4f2d00930ced217aa38fb6 100644 GIT binary patch delta 2328 zcma);du$X{6vn@MXXfs*YWq1)A~_8#NTy1vUnX)ItaWq*X~Hu?Ve- zCTVUv5;beu9R;LXx;Az^w{8>Y+7|^( zx~E!OaDcR}^@7&yqjVp1K2Y7cxG6{j3PGdIQs`$sB%7@;wpcp8nj@R#_lCk|W0k3J zQ)(V#o?%YqcpK|+QulMjSU@$EN^_#roWXjrsr3uQ050L&eMSi1sSye_Kqt-%&Amc* zVWZ6o;X}^$%Vy_-uO|1t)d)d<5H^<3K-x)m8JcDzX}w$<56~?G0~Q1oPa>Bkr`S!W zWo1b#^ipNDXfiVhx$d@^cLC0Q!7hv-jbh`t*|gNGBN1ZTNy$Zskk`o|mqy9=($uy< zcTiOv zw$(=b(s%|+?Lr5Z^}M6j6T{Z}LZs8&K#|iz^B+so&w4k<_c8Zi18uA+s1>HD4q{ex zvED#4`w=hVer!Y+u|8<(+skAWwmTva&;4QUBz;QtV@VUO0o%*7^j3%>cVLV=G{%k1 z>2~>R)H-3jTjYFdu*jWNC%j%vY%9+?`vZxb9#*=;j*4yOV8KyEQBF_rWFeQIu2D4I zQ}hbvmofmKIzum~=bltw(^89<>A3++m~VblNDe@k`U(woH=fH6=pWNf!C|-a%J@W8 zqxuCUUIlK7-|1y=heeAsG(NN7Y1)sN7xQ;2`>x}~mU%h6sZ3FDoQu1;QTUv>!9-Z^ zrWd2xIUT`7mEN#&uMckJIo;}z+scdSR$m44kDy{qtAg|2F$Pg^v_FcR_pCRw%das1 zunLv_unLHRqnVW6b-1NIM#38pKhH;n@a!mbr%5l#OZY$Tin!n$FUjOm)?`st)Or>< zI>E4$4k>{f%C-glN^D!wFGfeMF&p%m=jtZb{d9~;yg@Y3M>MgID3Fiqh~Y-GmaZOf zIz#bXoGbGq=INu+C029KS_^#2x|b-?N;GhhXrk7t!di?&))I8u>Bm_?4B%eY(}^~n zGMe+4S?1%+70k8OeCr_UGdOF-FpLYdsl#}Ww)qmW&ZKa2x?9xK5&9}Ifwzb$%tbvN zibqJ##5LlB_>Gvx-^9n@m-T4j_)6kTM6uENBwUrNkXzACZMP!8d=^deFh>kA0j1Iq zQ4FA+bvx@G)`wl{>Yw-OGoAzyK delta 2321 zcma);Yitx%6vzMf&dg<5w%gg3ZMWUl6c@^>P=WHWDuG%GbOotGC4_*1MNA`siX{Xv z+1C0>#KiVOBM%cQ35qnax>1SoK~pS2F=F@xCPqSx!Pr357~&_-Jv+1A`pIeXoB#iu zbDuMNJ6$WgR=)X~{Z2#A;ogH);&07Ih?&j{Z9tWtCTHmlVvV?+JuTKtclOZE zg?9~nzUs@jAB&zny68|gV&4)Hm$Xo&PBIDzYOzSSs`<0;C?K)6b9ejBXPyUL$4da4 z?uoXwI6>MqdPQ5yGP)1x57nMb%od~pg^-nY6#AGC%T}itJ&uWQ=Ey#I%~IHBZMGH0 zq~ZI_3(Q#@-^zNjH2s{iR#Ht|8BUjm^{m&}M(-sCaTOQuwZgcn&QoX(OyV11cvzS& zT%?^aKIUwnY}MaSnwI&%X@HVHsyYUG-Ng~X)gOaNeA#ajJTv|fDo2K?6 zOgE*N%DD#|Dns)qydjO#>14aH`1>?b=Srjxsm-3f9@aLA+jWY;ORgXlUt@{ta^gCbuGLny-l>t2o@VID#UZLBS*6=tb+VvFcx z-9a<^8GEr1yU|I!KV+NReliNLY7s2Y{B6HZdRXvVQX^NQ`XA5lLR=uqys_A=*ef)!2f`NI8N|JM%azh(X-LdM=TUUuGk- zh50yh19M9a-`a`h3{E*w4C69w>M-7;ZN7?>o>9D}X}74OBlG|=Oy}@;KVBH};3P;vqEyp(!>rsMT`qSd-OquLKn%edt$b1%yOo5+&$I znsu6W7weNAO?HI!2xo7wzQG!jd+=x~6RZ=`=q95dkxjA^+hm#(X-9=B}dM?-Z?u%J7b5I9079c5}QadAn15nr7RSN-G2-xu(gOz)gY{{ktCXI%gQ