작업 조건, 시간 분석 검색 기능 수정

Assets/WorkSpace/Personal/JYM/HTTPRequester.cs

@@ -69,6 +69,11 @@ namespace CHN
     {
         public Action<MachineKPIData> onMachineKPIData;
         public Action<WorkConditionFacilityData> onWorkConditionsfacilityData;
+        public Action<WorkConditionFacilityData> onWorkTimefacilityData;
+
+        public Action<WorkItemCodeData> onWorkConditionsItemCodeData;
+        public Action<WorkItemCodeData> onWorkTimeItemCodeData;
+
         public Action<WorkConditionsData> onSendWorkConditionsData;
         public Action<WorkTimeData> onSendWorkTimeData;
 
@@ -84,19 +89,20 @@ namespace CHN
         public string testAPIKey = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MywiZW1haWwiOiJ1dmMiLCJncm91cElkIjoyLCJncm91cENvZGUiOiJjaHVuaWxlbmciLCJyb2xlIjoiVGVuYW50QWRtaW4iLCJuYW1lIjoi7Jyg67mE7JSoIiwibGljZW5zZSI6ImJ1c2luZXNzIiwicGhvbmUiOiIiLCJpYXQiOjE3NDA1MzY0NzUsImV4cCI6NDg5NDEzNjQ3NX0.hr4D0bOA4K09Vhp12itiJgd-nVDQ3VZO8D7MVP5Ltw0";
         public string testHttpServer = "http://106.247.236.204:8863";
         public string facilityAPI = "/api/workConditionAnalysis/facilityCode";
+        public string workItemCodeAPI = "/api/workConditionAnalysis/workOrderAndItemCode";
         public string workingConditionsAPI = "/api/workConditionAnalysis/analyze";
         public string workingTimeAPI = "/api/workTimeAnalysis/analyze";
 
-        public string startDate;
-        public string endDate;
-
         public WorkConditionFacilityData workConditionFacilityData;
+        public WorkItemCodeData workItemCodeData;
         public WorkConditionsData workConditionsData;
         public WorkTimeData workTimeData;
+
+        private string startDate;
+        private string endDate;
         public void Start()
         {
             HTTPConnect();
-            StartCoroutine(HTTPWebRequest());
         }
         public void HTTPConnect()
         {
@@ -141,8 +147,15 @@ namespace CHN
                     break;
             }
         }
-        IEnumerator HTTPWebRequest()
+        public void GetFacilityCodeData(string panelName, string startDate, string endDate)
         {
+            StartCoroutine(GetFacilityCode(panelName, startDate, endDate));
+        }
+        IEnumerator GetFacilityCode(string panelName, string startDate, string endDate)
+        {
+            this.startDate = startDate;
+            this.endDate = endDate;
+
             var path = testHttpServer + facilityAPI;
             var query = $"?startDate={startDate}&endDate={endDate}";
 
@@ -159,7 +172,50 @@ namespace CHN
                 var response = JsonConvert.DeserializeObject<WorkConditionFacilityData>(payload);
                 workConditionFacilityData = response;
 
-                onWorkConditionsfacilityData?.Invoke(workConditionFacilityData);
+                if(panelName == "작업 조건 분석")
+                {
+                    onWorkConditionsfacilityData?.Invoke(workConditionFacilityData);
+                }
+                else if(panelName == "작업 시간 분석")
+                {
+                    onWorkTimefacilityData?.Invoke(workConditionFacilityData);
+                }
+            }
+            else
+            {
+                Debug.Log(www.error);
+            }
+        }
+        public void GetWorkItemCodeData(string panelName, string facilityCode)
+        {
+            StartCoroutine(GetWorkItemCode(panelName, facilityCode));
+        }
+        IEnumerator GetWorkItemCode(string panelName, string facilityCode)
+        {
+            var path = testHttpServer + workItemCodeAPI;
+            var query = $"?startDate={startDate}&endDate={endDate}&workcd={facilityCode}";
+
+            string url = path + query;
+
+            UnityWebRequest www = UnityWebRequest.Get(url);
+            www.SetRequestHeader("access-token", testAPIKey);
+
+            yield return www.SendWebRequest();
+
+            if (www.error == null)
+            {
+                var payload = Encoding.UTF8.GetString(www.downloadHandler.data);
+                var response = JsonConvert.DeserializeObject<WorkItemCodeData>(payload);
+                workItemCodeData = response;
+
+                if (panelName == "작업 조건 분석")
+                {
+                    onWorkConditionsItemCodeData?.Invoke(workItemCodeData);
+                }
+                else if (panelName == "작업 시간 분석")
+                {
+                    onWorkTimeItemCodeData?.Invoke(workItemCodeData);
+                }
             }
             else
             {

Assets/WorkSpace/Personal/JYM/UI_GraphChart.cs

@@ -69,12 +69,12 @@ public class UI_GraphChart : UIBase, IPointerClickHandler
         max = graphData.chartData.Max();
         ave = graphData.chartData.Average();
 
-        AveValue.SetText(ave.ToString());
+        AveValue.SetText(DecimalPointCalculate(ave));
 
         if (isMainChart)
         {
-            MinValue.SetText(min.ToString());
-            MaxValue.SetText(max.ToString());
+            MinValue.SetText(DecimalPointCalculate(min));
+            MaxValue.SetText(DecimalPointCalculate(max));
         }
         else
         {
@@ -93,5 +93,11 @@ public class UI_GraphChart : UIBase, IPointerClickHandler
         }
         Graph.DataSource.EndBatch();
     }
+    private string DecimalPointCalculate(float value)
+    {
+        var floatValue = Mathf.Round(value * 10f) / 10f;
+
+        return floatValue.ToString();
+    }
 
 }