비용절감에 bef,aft 시간 항목 추가

2021-06-02 12:53:00 +09:00
parent 6590694e8b
commit 2885994b51
9 changed files with 683 additions and 231 deletions
--- a/SubProject/WebServer/App.config
+++ b/SubProject/WebServer/App.config
@@ -3,7 +3,7 @@
  <configSections>
    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
      <section name="WebServer.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
    </sectionGroup>
  </configSections>
@@ -20,6 +20,14 @@
        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.2" newVersion="5.0.0.2" />
+      </dependentAssembly>
    </assemblyBinding>
  </runtime>
  <connectionStrings>
@@ -38,83 +46,83 @@
  <userSettings>
    <WebServer.Properties.Settings>
      <setting name="json" serializeAs="String">
-        <value>{
-  "basicGoods": [
-    {
-      "id": "1234561",
-      "name": "Mineral Water 550ml",
-      "barcode": "12421432143214321",
-      "price": "2.00",
-      "num": "1",
-      "amount": "2.00"
-    },
-    {
-      "id": "1234562",
-      "name": "Herbal tea 300ml",
-      "barcode": "12421432143214322",
-      "price": "3.00",
-      "num": "2",
-      "amount": "6.00"
-    },
-    {
-      "id": "1234563",
-      "name": "Delicious potato chips",
-      "barcode": "12421432143214323",
-      "price": "7.00",
-      "num": "4",
-      "amount": "28.00"
-    },
-    {
-      "id": "1234564",
-      "name": "Specially delicious egg rolls",
-      "barcode": "12421432143214324",
-      "price": "8.50",
-      "num": "3",
-      "amount": "25.50"
-    }
-  ],
-  "basicProgress": [
-    {
-      "key": "1",
-      "time": "2017-10-01 14:10",
-      "rate": "Contact Clients",
-      "status": "Processing",
-      "operator": "Pickup Assistant ID1234",
-      "cost": "5mins"
-    },
-    {
-      "key": "2",
-      "time": "2017-10-01 14:05",
-      "rate": "Pickup Guy Departs",
-      "status": "Success",
-      "operator": "Pickup Assistant ID1234",
-      "cost": "1h"
-    },
-    {
-      "key": "3",
-      "time": "2017-10-01 13:05",
-      "rate": "Pick-up person takes orders",
-      "status": "Success",
-      "operator": "Pickup Assistant ID1234",
-      "cost": "5mins"
-    },
-    {
-      "key": "4",
-      "time": "2017-10-01 13:00",
-      "rate": "Apply For Approval",
-      "status": "Success",
-      "operator": "system",
-      "cost": "1h"
-    },
-    {
-      "key": "5",
-      "time": "2017-10-01 12:00",
-      "rate": "Initiated a Return Request",
-      "status": "Success",
-      "operator": "user",
-      "cost": "5mins"
-    }
-  ]
+        <value>{
+  "basicGoods": [
+    {
+      "id": "1234561",
+      "name": "Mineral Water 550ml",
+      "barcode": "12421432143214321",
+      "price": "2.00",
+      "num": "1",
+      "amount": "2.00"
+    },
+    {
+      "id": "1234562",
+      "name": "Herbal tea 300ml",
+      "barcode": "12421432143214322",
+      "price": "3.00",
+      "num": "2",
+      "amount": "6.00"
+    },
+    {
+      "id": "1234563",
+      "name": "Delicious potato chips",
+      "barcode": "12421432143214323",
+      "price": "7.00",
+      "num": "4",
+      "amount": "28.00"
+    },
+    {
+      "id": "1234564",
+      "name": "Specially delicious egg rolls",
+      "barcode": "12421432143214324",
+      "price": "8.50",
+      "num": "3",
+      "amount": "25.50"
+    }
+  ],
+  "basicProgress": [
+    {
+      "key": "1",
+      "time": "2017-10-01 14:10",
+      "rate": "Contact Clients",
+      "status": "Processing",
+      "operator": "Pickup Assistant ID1234",
+      "cost": "5mins"
+    },
+    {
+      "key": "2",
+      "time": "2017-10-01 14:05",
+      "rate": "Pickup Guy Departs",
+      "status": "Success",
+      "operator": "Pickup Assistant ID1234",
+      "cost": "1h"
+    },
+    {
+      "key": "3",
+      "time": "2017-10-01 13:05",
+      "rate": "Pick-up person takes orders",
+      "status": "Success",
+      "operator": "Pickup Assistant ID1234",
+      "cost": "5mins"
+    },
+    {
+      "key": "4",
+      "time": "2017-10-01 13:00",
+      "rate": "Apply For Approval",
+      "status": "Success",
+      "operator": "system",
+      "cost": "1h"
+    },
+    {
+      "key": "5",
+      "time": "2017-10-01 12:00",
+      "rate": "Initiated a Return Request",
+      "status": "Success",
+      "operator": "user",
+      "cost": "5mins"
+    }
+  ]
 }</value>
      </setting>
    </WebServer.Properties.Settings>
--- a/SubProject/WebServer/Controller/APIController.cs
+++ b/SubProject/WebServer/Controller/APIController.cs
@@ -0,0 +1,150 @@
+using System;
+using System.Linq;
+using System.Net.Http;
+using System.Web.Http;
+using Newtonsoft.Json;
+
+namespace WebServer
+{
+    public class APIController : BaseController
+    {
+        [HttpGet]
+        public HttpResponseMessage Getdata()
+        {
+            var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
+
+            var sql = string.Empty;
+            var p_sql = getParams.Where(t => t.Key == "sql").FirstOrDefault();
+            if (p_sql.Key.isEmpty() == false) sql = p_sql.Value;
+            else
+            {
+                var p_table = getParams.Where(t => t.Key == "table").FirstOrDefault();
+                var p_gcode = getParams.Where(t => t.Key == "gcode").FirstOrDefault();
+                var p_where = getParams.Where(t => t.Key == "w").FirstOrDefault();
+                var p_order = getParams.Where(t => t.Key == "o").FirstOrDefault();
+                sql = "select * from {0} where gcode = '{gcode}'";
+                sql = string.Format(sql, p_table.Value, p_gcode.Value);
+                if (p_where.Key != null) sql += " and " + p_where.Value;
+                if (p_order.Key != null) sql += " order by " + p_order.Value;
+            }
+
+
+            if (FCOMMON.info.Login.gcode == null)
+                FCOMMON.info.Login.gcode = "EET1P";
+            sql = sql.Replace("{gcode}", FCOMMON.info.Login.gcode);
+
+            var cs = "Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!";
+            var cn = new System.Data.SqlClient.SqlConnection(cs);
+            var cmd = new System.Data.SqlClient.SqlCommand(sql, cn);
+            var da = new System.Data.SqlClient.SqlDataAdapter(cmd);
+            var dt = new System.Data.DataTable();
+            da.Fill(dt);
+            da.Dispose();
+            cmd.Dispose();
+            cn.Dispose();
+
+            var txtjson = JsonConvert.SerializeObject(dt, new JsonSerializerSettings
+            {
+                NullValueHandling = NullValueHandling.Ignore
+            });
+
+            var resp = new HttpResponseMessage()
+            {
+                Content = new StringContent(
+            txtjson,
+           System.Text.Encoding.UTF8,
+           "application/json")
+            };
+
+            return resp;
+
+
+        }
+
+        [HttpGet]
+        public HttpResponseMessage Gettable()
+        {
+            var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
+
+            var sql = string.Empty;
+            var p_sql = getParams.Where(t => t.Key == "sql").FirstOrDefault();
+            if (p_sql.Key.isEmpty() == false) sql = p_sql.Value;
+            else
+            {
+                var p_table = getParams.Where(t => t.Key == "table").FirstOrDefault();
+                var p_gcode = getParams.Where(t => t.Key == "gcode").FirstOrDefault();
+                var p_where = getParams.Where(t => t.Key == "w").FirstOrDefault();
+                var p_order = getParams.Where(t => t.Key == "o").FirstOrDefault();
+                sql = "select * from {0} where gcode = '{gcode}'";                
+                sql = string.Format(sql, p_table.Value, p_gcode.Value);
+                if (p_where.Key != null) sql += " and " + p_where.Value;
+                if (p_order.Key != null) sql += " order by " + p_order.Value;
+            }
+
+
+            if (FCOMMON.info.Login.gcode == null)
+                FCOMMON.info.Login.gcode = "EET1P";
+            sql = sql.Replace("{gcode}", FCOMMON.info.Login.gcode);
+
+            var cs = "Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!";
+            var cn = new System.Data.SqlClient.SqlConnection(cs);
+            var cmd = new System.Data.SqlClient.SqlCommand(sql, cn);
+            var da = new System.Data.SqlClient.SqlDataAdapter(cmd);
+            var dt = new System.Data.DataTable();
+            da.Fill(dt);
+            da.Dispose();
+            cmd.Dispose();
+            cn.Dispose();
+
+            var txtjson = JsonConvert.SerializeObject(dt, new JsonSerializerSettings
+            {
+                NullValueHandling = NullValueHandling.Ignore
+            });
+
+            var resp = new HttpResponseMessage()
+            {
+                Content = new StringContent(
+            txtjson,
+           System.Text.Encoding.UTF8,
+           "application/json")
+            };
+
+            return resp;
+
+
+        }
+
+
+
+        [HttpGet]
+        public HttpResponseMessage Index()
+        {
+            //로그인이 되어있지않다면 로그인을 가져온다
+            MethodResult result;
+            result = View();
+
+            var model = GetGlobalModel();
+            var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
+
+            //기본값을 찾아서 없애줘야한다
+            var contents = result.Content;
+
+            //공용값 적용
+            ApplyCommonValue(ref contents);
+
+            //최종문자 적용
+            result.Content = contents;
+
+            var resp = new HttpResponseMessage()
+            {
+                Content = new StringContent(
+              result.Content,
+              System.Text.Encoding.UTF8,
+              "text/html")
+            };
+
+            return resp;
+        }
+
+    }
+}
--- a/SubProject/WebServer/WebServer.csproj
+++ b/SubProject/WebServer/WebServer.csproj
@@ -51,6 +51,9 @@
    <Reference Include="Microsoft.AspNet.SignalR.Owin, Version=1.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.AspNet.SignalR.Owin.1.2.2\lib\net45\Microsoft.AspNet.SignalR.Owin.dll</HintPath>
    </Reference>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    </Reference>
    <Reference Include="Microsoft.Owin, Version=4.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.Owin.4.2.0\lib\net45\Microsoft.Owin.dll</HintPath>
    </Reference>
@@ -79,21 +82,37 @@
      <HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
    </Reference>
    <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
    <Reference Include="System.ComponentModel.Composition" />
    <Reference Include="System.ComponentModel.DataAnnotations" />
    <Reference Include="System.Core" />
    <Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
    </Reference>
+    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
    <Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
    </Reference>
    <Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
    </Reference>
+    <Reference Include="System.Net.Http.Json, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Net.Http.Json.5.0.0\lib\net461\System.Net.Http.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
    <Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
    <Reference Include="System.Runtime.Serialization" />
    <Reference Include="System.Security" />
    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -108,6 +127,18 @@
    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
    </Reference>
+    <Reference Include="System.Text.Encodings.Web, Version=5.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Text.Encodings.Web.5.0.1\lib\net461\System.Text.Encodings.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Json, Version=5.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Text.Json.5.0.2\lib\net461\System.Text.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
+    </Reference>
    <Reference Include="System.Web.Cors, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.AspNet.Cors.5.0.0\lib\net45\System.Web.Cors.dll</HintPath>
    </Reference>
@@ -133,6 +164,7 @@
    </Compile>
    <Compile Include="Controller\CustomerController.cs" />
    <Compile Include="Controller\CommonController.cs" />
+    <Compile Include="Controller\APIController.cs" />
    <Compile Include="Controller\HomeController.cs" />
    <Compile Include="Controller\ItemController.cs" />
    <Compile Include="Controller\JobreportController.cs" />
--- a/SubProject/WebServer/packages.config
+++ b/SubProject/WebServer/packages.config
@@ -11,6 +11,7 @@
  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net47" />
  <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.7" targetFramework="net47" />
  <package id="Microsoft.AspNet.WebApi.OwinSelfHost" version="5.2.7" targetFramework="net47" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" targetFramework="net47" />
  <package id="Microsoft.Owin" version="4.2.0" targetFramework="net47" />
  <package id="Microsoft.Owin.Cors" version="4.2.0" targetFramework="net47" />
  <package id="Microsoft.Owin.Diagnostics" version="4.2.0" targetFramework="net47" />
@@ -22,11 +23,20 @@
  <package id="Microsoft.Owin.StaticFiles.ko" version="4.2.0" targetFramework="net47" />
  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net47" />
  <package id="Owin" version="1.0" targetFramework="net47" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net47" />
  <package id="System.IO" version="4.3.0" targetFramework="net47" />
+  <package id="System.Memory" version="4.5.4" targetFramework="net47" />
  <package id="System.Net.Http" version="4.3.4" targetFramework="net47" />
+  <package id="System.Net.Http.Json" version="5.0.0" targetFramework="net47" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net47" />
  <package id="System.Runtime" version="4.3.0" targetFramework="net47" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net47" />
  <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net47" />
  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net47" />
  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net47" />
  <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net47" />
+  <package id="System.Text.Encodings.Web" version="5.0.1" targetFramework="net47" />
+  <package id="System.Text.Json" version="5.0.2" targetFramework="net47" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net47" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net47" />
 </packages>