From 6a72a3edec87cca9996c7ab3be3fd48479881945 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 02 12월 2021 21:55:28 +0900
Subject: [PATCH] 충돌 수정
---
src/main/webapp/scripts/app/api/apiMonitor.controller.js | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 114 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/scripts/app/api/apiMonitor.controller.js b/src/main/webapp/scripts/app/api/apiMonitor.controller.js
index 5d08ec8..abfbe73 100644
--- a/src/main/webapp/scripts/app/api/apiMonitor.controller.js
+++ b/src/main/webapp/scripts/app/api/apiMonitor.controller.js
@@ -7,19 +7,128 @@
'app', 'angular'
],
function (app, angular) {
- app.controller('apiMonitorController', ['$scope', '$rootScope', '$log', '$resourceProvider','SweetAlert', '$timeout', '$filter',
- function ($scope, $rootScope, $log, $resourceProvider, SweetAlert, $timeout, $filter) {
+ app.controller('apiMonitorController', ['$scope', '$rootScope', '$log', '$resourceProvider','SweetAlert', '$timeout', '$filter', 'Api',
+ function ($scope, $rootScope, $log, $resourceProvider, SweetAlert, $timeout, $filter, Api) {
$scope.fn = {
-
+ drawChart : drawChart,
+ changeSearchPeriod : changeSearchPeriod
};
$scope.vm = {
- form : {
-
+ search : {
+ searchPeriod : "LAST_SEVEN_DAYS"
+ },
+ apiMonitorVos : [],
+ issueTypeVos : [],
+ chartData : {
+ rows: [],
+ columns: [],
+ options: {
+ chart: {
+ title: '�씪媛� �쑀�삎蹂� API �궗�슜 �쁽�솴',
+ subtitle: '理쒓렐 15�씪'
+ },
+ width: 900,
+ height: 500
+ }
}
};
+ function changeSearchPeriod() {
+ drawChart();
+ }
+ $scope.fn.drawChart();
+
+ function drawChart() {
+
+ var content = {
+ searchPeriod : $scope.vm.search.searchPeriod,
+ searchStartDate : "",
+ searchEndDate : ""
+ };
+
+ Api.findHistory($resourceProvider.getContent(content,
+ $resourceProvider.getPageContent(0, 0))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+ if ( result.data.data != null) {
+ $scope.vm.chartData.columns = [];
+ // $scope.vm.chartData.columns.push({id:'number', name:"�궇吏�"});
+ // $scope.vm.chartData.columns.push({id:'number', name:"�솃�럹�씠吏� 蹂�議� �깘吏�"});
+ // $scope.vm.chartData.columns.push({id:'number', name:"寃쎌쑀吏� �깘吏�"});
+ // $scope.vm.chartData.columns.push({id:'number', name:"�씪媛� 議고쉶"});
+
+ $scope.vm.chartData.rows = [];
+ // $scope.vm.chartData.rows.push([1, 37.8, 80.8, 41.8]);
+ // $scope.vm.chartData.rows.push([2, 30.9, 69.5, 32.4]);
+ // $scope.vm.chartData.rows.push([3, 25.4, 57, 25.7]);
+ // $scope.vm.chartData.rows.push([4, 11.7, 18.8, 10.5, 1.0]);
+
+ let apiMonitorVos = result.data.data.apiMonitorVos;
+ let issueTypeVos = result.data.data.issueTypeVos;
+
+ $scope.vm.apiMonitorVos = apiMonitorVos;
+ $scope.vm.issuTypeVos = issueTypeVos;
+
+ $scope.vm.chartData.columns.push({id: 'number', name: "�궇吏�"});
+ issueTypeVos.forEach(function (issueTypeVo) {
+ $scope.vm.chartData.columns.push({id: 'number', name: issueTypeVo.name});
+ });
+
+ var index = 1;
+ apiMonitorVos.forEach(function (apiMonitorVo) {
+ var row = [];
+ row.push(index);
+ if (apiMonitorVo.issueTypeCountList != null) {
+ apiMonitorVo.issueTypeCountList.forEach(function (count) {
+ row.push(count);
+ });
+ }
+ $scope.vm.chartData.rows.push(row);
+ index++;
+ });
+
+ $scope.$broadcast("drawChart");
+ }
+ }
+ else {
+ SweetAlert.swal($filter("translate")("api.failedToApiMonitor"), result.data.message.message, "error"); // "API 湲곕줉 議고쉶 �떎�뙣"
+ }
+ });
+
+ // data.addColumn('number', '�궇吏�');
+ // data.addColumn('number', '�솃�럹�씠吏� 蹂�議� �깘吏�');
+ // data.addColumn('number', '寃쎌쑀吏� �깘吏�');
+ // data.addColumn('number', '�씪媛� 議고쉶');
+ // $scope.vm.chartData.columns.push({id:'number', name:"�궇吏�"});
+ // $scope.vm.chartData.columns.push({id:'number', name:"�솃�럹�씠吏� 蹂�議� �깘吏�"});
+ // $scope.vm.chartData.columns.push({id:'number', name:"寃쎌쑀吏� �깘吏�"});
+ // $scope.vm.chartData.columns.push({id:'number', name:"�씪媛� 議고쉶"});
+ // $scope.vm.chartData.columns.push({id:'number', name:"�씪媛� 議고쉶�뀅"});
+ //
+ // $scope.vm.chartData.rows.push([1, 37.8, 80.8, 41.8]);
+ // $scope.vm.chartData.rows.push([2, 30.9, 69.5, 32.4]);
+ // $scope.vm.chartData.rows.push([3, 25.4, 57, 25.7]);
+ // $scope.vm.chartData.rows.push([4, 11.7, 18.8, 10.5, 1.0]);
+
+ // data.addRows([
+ // [1, 37.8, 80.8, 41.8, 0],
+ // [2, 30.9, 69.5, 32.4, 0],
+ // [3, 25.4, 57, 25.7, 0],
+ // [4, 11.7, 18.8, 10.5, 0],
+ // [5, 11.9, 17.6, 10.4, 0],
+ // [6, 8.8, 13.6, 7.7, 0],
+ // [7, 7.6, 12.3, 9.6, 0],
+ // [8, 12.3, 29.2, 10.6, 0],
+ // [9, 16.9, 42.9, 14.8, 0],
+ // [10, 12.8, 30.9, 11.6, 0],
+ // [11, 5.3, 7.9, 4.7, 0],
+ // [12, 6.6, 8.4, 5.2, 0],
+ // [13, 4.8, 6.3, 3.6, 0],
+ // [14, 4.2, 6.2, 3.4, 0]
+ // ]);
+ }
}]);
});
--
Gitblit v1.8.0