diff --git a/src/components/dashboard/DashboardGroupList.js b/src/components/dashboard/DashboardGroupList.js index c9aecce..be78734 100644 --- a/src/components/dashboard/DashboardGroupList.js +++ b/src/components/dashboard/DashboardGroupList.js @@ -1,34 +1,193 @@ import { Plus } from 'react-feather'; -import { Card, CardBody, CardHeader, CardTitle, Table } from 'reactstrap'; +import { Card, CardBody, CardHeader, CardTitle } from 'reactstrap'; +import { GridDatabase } from '../../components/crud/grid/GridDatatable'; +import { EDateType } from '../../modules/main/dash/models/mainDashModel.ts'; +import { IoIosArrowRoundDown, IoIosArrowRoundUp } from 'react-icons/io'; -export const DashboardGroupList = props => { +const titles = { + dailyFlightPlan: '일일 비행계획 현황', + dailyFlightCount: '일일 비행건수 현황', + dailyFlightWarn: '일일 비정상상황 현황' +}; + +const columns = { + dailyFlightPlan: [ + { + id: 'dateType', + name: '구분', + minWidth: '50px', + center: true, + cell: (row, i) =>
{EDateType[`${row.dateType}`]}
+ }, + { + id: 'plan', + name: '제출', + minWidth: '50px', + center: true, + cell: (row, i) =>
{row.plan}
+ }, + { + id: 'aprvn', + name: '승인', + minWidth: '50px', + center: true, + cell: row => { + return
{row.aprvn}
; + } + }, + { + id: 'count', + name: '합계', + minWidth: '50px', + center: true, + cell: row => { + return
{row.count}
; + } + }, + { + id: 'note', + name: '비고', + left: true, + cell: row => { + return ( +
+ {row.note >= 0 ? ( + + ) : ( + + )} + {Math.sqrt(Math.pow(Math.floor(row.note), 2))}% +
+ ); + } + } + ], + dailyFlightCount: [ + { + id: 'dateType', + name: '구분', + minWidth: '50px', + center: true, + cell: (row, i) =>
{EDateType[`${row.dateType}`]}
+ }, + { + id: 'flightPlan', + name: '계획', + minWidth: '50px', + center: true, + cell: (row, i) =>
{row.flightPlan}
+ }, + { + id: 'completeFlight', + name: '비행완료', + center: true, + cell: row => { + return
{row.completeFlight}
; + } + }, + { + id: 'notFlight', + name: '미비행', + center: true, + cell: row => { + return
{row.notFlight}
; + } + }, + { + id: 'note', + name: '비고', + left: true, + cell: row => { + return ( +
+ {row.note >= 0 ? ( + + ) : ( + + )} + {Math.sqrt(Math.pow(Math.floor(row.note), 2))}% +
+ ); + } + } + ], + dailyFlightWarn: [ + { + id: 'dateType', + name: '구분', + minWidth: '80px', + center: true, + cell: row =>
{EDateType[`${row.dateType}`]}
+ }, + { + id: 'plan', + name: '비행경로이탈', + minWidth: '120px', + center: true, + cell: (row, i) =>
{row.plan}
+ }, + { + id: 'altitude', + name: '비정상 고도', + minWidth: '105px', + center: true, + cell: row => { + return
{row.altitude}
; + } + }, + { + id: 'crash', + name: '충돌위험', + minWidth: '95px', + center: true, + cell: row => { + return
{row.crash}
; + } + }, + { + id: 'count', + name: '합계', + minWidth: '80px', + center: true, + cell: row => { + return
{row.count}
; + } + }, + { + id: 'note', + name: '비고', + left: true, + cell: row => { + return ( +
+ {row.note >= 0 ? ( + + ) : ( + + )} + {Math.sqrt(Math.pow(Math.floor(row.note), 2))}% +
+ ); + } + } + ] +}; + +export const DashboardGroupList = ({ title, pageMove, data }) => { return ( - 그룹 정보 - - - - - - - - - - {props.data?.map((item, index) => { - return ( - - - - - ); - })} - -
그룹 명생성일시
{item.groupNm}{item.createDt}
+ ); diff --git a/src/components/dashboard/DashboardStcsArea.js b/src/components/dashboard/DashboardStcsArea.js index 99375d8..8aa727d 100644 --- a/src/components/dashboard/DashboardStcsArea.js +++ b/src/components/dashboard/DashboardStcsArea.js @@ -1,32 +1,53 @@ import { ko } from 'date-fns/esm/locale'; -import React, { useEffect, useState } from 'react'; +import { useEffect, useState } from 'react'; +import { Plus } from 'react-feather'; import { Doughnut } from 'react-chartjs-2'; import DatePicker from 'react-datepicker'; import 'react-datepicker/dist/react-datepicker.css'; import { Calendar } from 'react-feather'; import { Card, CardBody, CardHeader, CardTitle } from 'reactstrap'; -import { useSkin } from '../../utility/hooks/useSkin'; + +const tooltipShadow = 'rgba(0, 0, 0, 0.25)'; +const warningLightColor = '#FDAC34'; +const successColorShade = '#28dac6'; +const primaryColorShade = '#836AF9'; +const yellowColor = '#ffe800'; +const blueColor = '#2c9aff'; + +const options = { + responsive: true, + maintainAspectRatio: false, + responsiveAnimationDuration: 500, + cutoutPercentage: 60, + legend: { display: false }, + tooltips: { + callbacks: { + // label(tooltipItem, data) { + // const label = data.datasets[0].labels[tooltipItem.index] || '', + // value = data.datasets[0].data[tooltipItem.index]; + // const output = ` ${label} : ${value} %`; + // return output; + // } + }, + // Updated default tooltip UI + shadowOffsetX: 1, + shadowOffsetY: 1, + shadowBlur: 8, + shadowColor: tooltipShadow, + backgroundColor: '#fff', + titleFontColor: '#000', + bodyFontColor: '#000' + } +}; + +const titles = { + droneStatus: '드론 현황', + flightsRegion: 'TOP5 지역 별 비행횟수 통계' +}; export const DashboardStcsArea = props => { const [chartData, setChartData] = useState({}); - const [skin, setSkin] = useSkin(), - labelColor = skin === 'dark' ? '#b4b7bd' : '#6e6b7b', - tooltipShadow = 'rgba(0, 0, 0, 0.25)', - gridLineColor = 'rgba(200, 200, 200, 0.2)', - lineChartPrimary = '#666ee8', - lineChartDanger = '#ff4961', - warningColorShade = '#ffe802', - warningLightColor = '#FDAC34', - successColorShade = '#28dac6', - primaryColorShade = '#836AF9', - infoColorShade = '#299AFF', - yellowColor = '#ffe800', - greyColor = '#4F5D70', - blueColor = '#2c9aff', - blueLightColor = '#84D0FF', - greyLightColor = '#EDF1F4'; - const arrColors = [ successColorShade, warningLightColor, @@ -43,32 +64,6 @@ export const DashboardStcsArea = props => { 'blueColor' ]; - const options = { - responsive: true, - maintainAspectRatio: false, - responsiveAnimationDuration: 500, - cutoutPercentage: 60, - legend: { display: false }, - tooltips: { - callbacks: { - // label(tooltipItem, data) { - // const label = data.datasets[0].labels[tooltipItem.index] || '', - // value = data.datasets[0].data[tooltipItem.index]; - // const output = ` ${label} : ${value} %`; - // return output; - // } - }, - // Updated default tooltip UI - shadowOffsetX: 1, - shadowOffsetY: 1, - shadowBlur: 8, - shadowColor: tooltipShadow, - backgroundColor: '#fff', - titleFontColor: '#000', - bodyFontColor: '#000' - } - }; - const chartDataInit = () => { let arrArea = []; let arrValue = []; @@ -98,7 +93,7 @@ export const DashboardStcsArea = props => { return ( - TOP5 지역 별 비행횟수 통계 + {titles[`${props.title}`]} {/*
{ className='form-control flat-picker bg-transparent border-0 shadow-none' />
*/} -
-
- - props.setStartDate(date)} - dateFormat='yyy / MMMM' - showMonthYearPicker - showFullMonthYearPicker - showFourColumnMonthYearPicker - className='form-control bg-transparent border-0 shadow-none' - /> -
-
+ {props.title === 'flightsRegion' && ( + <> +
+
+ + props.setStartDate(date)} + dateFormat='yyy / MMMM' + showMonthYearPicker + showFullMonthYearPicker + showFourColumnMonthYearPicker + className='form-control bg-transparent border-0 shadow-none' + /> +
+
+ + + )}
- +
{props.data?.map((item, index) => { diff --git a/src/components/dashboard/DashboardStcsDay.js b/src/components/dashboard/DashboardStcsDay.js index ad35e2d..50cb0e9 100644 --- a/src/components/dashboard/DashboardStcsDay.js +++ b/src/components/dashboard/DashboardStcsDay.js @@ -1,95 +1,83 @@ +import 'react-datepicker/dist/react-datepicker.css'; import { ko } from 'date-fns/esm/locale'; -import React, { useEffect, useState } from 'react'; +import { Plus } from 'react-feather'; +import { useEffect, useState } from 'react'; import { Bar } from 'react-chartjs-2'; import DatePicker from 'react-datepicker'; -import 'react-datepicker/dist/react-datepicker.css'; import { Calendar } from 'react-feather'; import { Card, CardBody, CardHeader, CardTitle } from 'reactstrap'; -import { useSkin } from '../../utility/hooks/useSkin'; -export const DashboardStcsDay = props => { - const [chartData, setChartData] = useState({}); +const tooltipShadow = 'rgba(0, 0, 0, 0.25)'; +const gridLineColor = 'rgba(200, 200, 200, 0.2)'; +const successColorShade = '#28dac6'; - const [skin, setSkin] = useSkin(), - labelColor = skin === 'dark' ? '#b4b7bd' : '#6e6b7b', - tooltipShadow = 'rgba(0, 0, 0, 0.25)', - gridLineColor = 'rgba(200, 200, 200, 0.2)', - lineChartPrimary = '#666ee8', - lineChartDanger = '#ff4961', - warningColorShade = '#ffe802', - warningLightColor = '#FDAC34', - successColorShade = '#28dac6', - primaryColorShade = '#836AF9', - infoColorShade = '#299AFF', - yellowColor = '#ffe800', - greyColor = '#4F5D70', - blueColor = '#2c9aff', - blueLightColor = '#84D0FF', - greyLightColor = '#EDF1F4'; +const options = { + elements: { + rectangle: { + borderWidth: 2, + borderSkipped: 'bottom' + } + }, + responsive: true, + maintainAspectRatio: false, + responsiveAnimationDuration: 500, + legend: { + display: false + }, - const options = { - elements: { - rectangle: { - borderWidth: 2, - borderSkipped: 'bottom' - } - }, - responsive: true, - maintainAspectRatio: false, - responsiveAnimationDuration: 500, - legend: { - display: false - }, - tooltips: { - // Updated default tooltip UI - shadowOffsetX: 1, - shadowOffsetY: 1, - shadowBlur: 8, - shadowColor: tooltipShadow, - backgroundColor: '#fff', - titleFontColor: '#000', - bodyFontColor: '#000' - }, - scales: { - xAxes: [ - { + tooltips: { + // Updated default tooltip UI + shadowOffsetX: 1, + shadowOffsetY: 1, + shadowBlur: 8, + shadowColor: tooltipShadow, + backgroundColor: '#fff', + titleFontColor: '#000', + bodyFontColor: '#000' + }, + scales: { + xAxes: [ + { + display: true, + gridLines: { display: true, - gridLines: { - display: true, - color: gridLineColor, - zeroLineColor: gridLineColor - }, - scaleLabel: { - display: false - }, - ticks: { - fontColor: labelColor - } + color: gridLineColor, + zeroLineColor: gridLineColor + }, + scaleLabel: { + display: false + }, + ticks: { + fontColor: '#6e6b7b' } - ], - yAxes: [ - { - display: true, - gridLines: { - color: gridLineColor, - zeroLineColor: gridLineColor - }, - ticks: { - stepSize: 1, - // min: 0, - // max: 400, - fontColor: labelColor - } + } + ], + yAxes: [ + { + display: true, + gridLines: { + color: gridLineColor, + zeroLineColor: gridLineColor + }, + ticks: { + stepSize: 1, + // min: 0, + // max: 400, + fontColor: '#6e6b7bs' } - ] - } - }; + } + ] + } +}; + +export const DashboardStcsDay = ({ startDate, setStartDate, data }) => { + const [chartData, setChartData] = useState({}); const chartDataInit = () => { let arrDay = []; let arrValue = []; - props.data?.map(item => { + data?.map(item => { arrDay.push(item.typeCd); arrValue.push(item.count); }); @@ -110,7 +98,7 @@ export const DashboardStcsDay = props => { useEffect(() => { chartDataInit(); - }, [props.data]); + }, [data]); return ( @@ -121,8 +109,8 @@ export const DashboardStcsDay = props => { props.setStartDate(date)} + selected={startDate} + onChange={date => setStartDate(date)} dateFormat='yyy / MMMM' showMonthYearPicker showFullMonthYearPicker @@ -131,10 +119,37 @@ export const DashboardStcsDay = props => { />
+
- +
diff --git a/src/components/dashboard/DroneFlightSchedule.js b/src/components/dashboard/DroneFlightSchedule.js new file mode 100644 index 0000000..067cf95 --- /dev/null +++ b/src/components/dashboard/DroneFlightSchedule.js @@ -0,0 +1,99 @@ +import { Plus } from 'react-feather'; +import { Card, CardBody, CardHeader, CardTitle, Input, Col } from 'reactstrap'; +import { GridDatabase } from '../../components/crud/grid/GridDatatable'; + +const columns = [ + { + id: 'a', + name: '그룹 몇', + minWidth: '50px', + center: true, + cell: (row, i) =>
{row.a}
+ }, + { + id: 'b', + name: '조종자', + minWidth: '50px', + center: true, + cell: (row, i) =>
{row.b}
+ }, + { + id: 'c', + name: '기체 신고 번호', + minWidth: '50px', + center: true, + cell: row => { + return
{row.c}
; + } + }, + { + id: 'd', + name: '비행 시작 시간', + minWidth: '50px', + center: true, + cell: row => { + return
{row.d}
; + } + }, + { + id: 'e', + name: '비행 종료 시간', + left: true, + cell: row => { + return
{row.e}
; + } + }, + { + id: 'e', + name: '총 예상 비행시간', + left: true, + cell: row => { + return
{row.f}
; + } + }, + { + id: 'e', + name: '상태', + left: true, + cell: row => { + return
{row.g}
; + } + } +]; + +const dummyData = [ + { + a: '공항공사', + b: '홍길동', + c: 'PA123456', + d: '2023-11-11 10:00', + e: '2023-11-11 11:00', + f: '01:00', + g: '비행완료' + } +]; + +export default function DroneFlightSchedule({ pageMove, data }) { + return ( + + + 드론 별 비행운항 목록 + + + + + + + + + + + + ); +} diff --git a/src/containers/main/dash/MainDashContainer.js b/src/containers/main/dash/MainDashContainer.js index 80233be..0f7b981 100644 --- a/src/containers/main/dash/MainDashContainer.js +++ b/src/containers/main/dash/MainDashContainer.js @@ -1,28 +1,32 @@ -import moment from 'moment'; -import { useEffect, useState } from 'react'; +import { useEffect, useState, useCallback } from 'react'; import { shallowEqual, useDispatch, useSelector } from 'react-redux'; import { useHistory } from 'react-router-dom'; +import moment from 'moment'; import { Col, Row } from 'reactstrap'; -import { DashboardDronList } from '../../../components/dashboard/DashboardDronList'; +import DroneFlightSchedule from '../../../components/dashboard/DroneFlightSchedule'; import { DashboardGroupList } from '../../../components/dashboard/DashboardGroupList'; -import { DashboardMenu } from '../../../components/dashboard/DashboardMenu'; import { DashboardStcsArea } from '../../../components/dashboard/DashboardStcsArea'; import { DashboardStcsDay } from '../../../components/dashboard/DashboardStcsDay'; import * as Actions from '../../../modules/main/dash/actions/mainDashAction'; +import '@styles/react/libs/flatpickr/flatpickr.scss'; +import '@styles/react/libs/tables/react-dataTable-component.scss'; +import '../../../assets/css/custom.css'; export const MainDashContainer = () => { const dispatch = useDispatch(); - const { stcsDayList, stcsAreaList, groupList, dronList } = useSelector( - state => state.mainDashState + /* + stcsDayList : 일 별 비행횟수 + stcsAreaList: TOP 5 지역 별 비행횟수 + */ + + const [dashboardData] = useSelector( + state => [state.mainDashState.dashboardData], + shallowEqual ); - - const history = useHistory(); - const { user } = useSelector(state => state.authState, shallowEqual); - const [dayStartDate, setDayStartDate] = useState(new Date()); - const [areaStartDate, setAreaStartDate] = useState(new Date()); + const history = useHistory(); const handlerStcsDaySearch = date => { dispatch( @@ -56,10 +60,13 @@ export const MainDashContainer = () => { ); }; - const handlerStcsDayParam = date => { - setDayStartDate(date); - handlerStcsDaySearch(date); - }; + const handlerStcsDayParam = useCallback( + date => { + setDayStartDate(date); + handlerStcsDaySearch(date); + }, + [dayStartDate] + ); const handlerStcsAreaParam = date => { setAreaStartDate(date); @@ -70,43 +77,48 @@ export const MainDashContainer = () => { history.push('/basis/dron/index'); }; - const handlerGroupDetail = () => { + const handlerGroupDetail = useCallback(val => { history.push('/basis/group/index'); - }; + }, []); const movePage = url => { history.push(url); }; useEffect(() => { - handlerStcsDaySearch(dayStartDate); - handlerStcsAreaSearch(areaStartDate); - handlerGroupSearch(); - handlerDronSearch(); + dispatch( + Actions.DASHBOARD_DATA.request({ + stcsDay: moment(dayStartDate).format('YYYY-MM') + }) + ); + // handlerStcsDaySearch(dayStartDate); + // handlerStcsAreaSearch(areaStartDate); + // handlerGroupSearch(); + // handlerDronSearch(); }, []); - useEffect(() => {}, [stcsDayList]); - return (
- {/* */}
@@ -114,18 +126,18 @@ export const MainDashContainer = () => {
- + + { + // 드론 현황 + } @@ -136,15 +148,19 @@ export const MainDashContainer = () => { + { + // top5 지역 별 바행횟수 + } diff --git a/src/modules/main/dash/actions/mainDashAction.ts b/src/modules/main/dash/actions/mainDashAction.ts index 3bdcea7..e19791f 100644 --- a/src/modules/main/dash/actions/mainDashAction.ts +++ b/src/modules/main/dash/actions/mainDashAction.ts @@ -4,7 +4,9 @@ import { DronListData, GroupListData, StcsAreaData, - StcsDayData + StcsDayData, + IDashBoardData, + IDashBoardRq } from '../models/mainDashModel'; const STCS_DAY_REQUEST = 'main/dash/STCS_DAY_REQUEST'; @@ -23,11 +25,15 @@ const DRON_LIST_REQUEST = 'main/dash/DRON_LIST_REQUEST'; const DRON_LIST_SUCCESS = 'main/dash/DRON_LIST_SUCCESS'; const DRON_LIST_FAILURE = 'main/dash/DRON_LIST_FAILURE'; +const DASHBOARD_DATA_REQUEST = 'main/dashboard/DATA_REQUEST'; +const DASHBOARD_DATA_SUCCESS = 'main/dashboard/DATA_SUCCESS'; +const DASHBOARD_DATA_FAILURE = 'main/dashboard/DATA_FAILURE'; + export const STCS_DAY = createAsyncAction( STCS_DAY_REQUEST, STCS_DAY_SUCCESS, STCS_DAY_FAILURE -)(); +)<{ yyyymm: string }, { data: StcsDayData[] }, AxiosError>(); export const STCS_AREA = createAsyncAction( STCS_AREA_REQUEST, @@ -47,11 +53,18 @@ export const DRON_LIST = createAsyncAction( DRON_LIST_FAILURE )(); +export const DASHBOARD_DATA = createAsyncAction( + DASHBOARD_DATA_REQUEST, + DASHBOARD_DATA_SUCCESS, + DASHBOARD_DATA_FAILURE +)(); + const actions = { STCS_DAY, STCS_AREA, GROUP_LIST, - DRON_LIST + DRON_LIST, + DASHBOARD_DATA }; export type MainDashAction = ActionType; diff --git a/src/modules/main/dash/apis/mainDashApi.ts b/src/modules/main/dash/apis/mainDashApi.ts index 7f1b539..1ea9c15 100644 --- a/src/modules/main/dash/apis/mainDashApi.ts +++ b/src/modules/main/dash/apis/mainDashApi.ts @@ -1,12 +1,14 @@ import qs from 'qs'; import axios from '../../../utils/customAxiosUtil'; +import { IDashBoardRq } from '../models/mainDashModel'; export const mainDashAPI = { - stcsDay: async (data: string) => { + stcsDay: async (data: { yyyymm: string }) => { const queryString = qs.stringify(data, { addQueryPrefix: true, arrayFormat: 'repeat' }); + console.log(data); return await axios.get(`api/main/dash/stcs/day${queryString}`); }, stcsArea: async (data: string) => { @@ -31,5 +33,14 @@ export const mainDashAPI = { arrayFormat: 'repeat' }); return await axios.get(`api/main/dash/arcrft/list${queryString}`); + }, + dailyFlightWarn: async () => { + return await axios.get('api/main/dash/current/flight-warn'); + }, + dailyFlightPlan: async () => { + return await axios.get('api/main/dash/current/flight-plan'); + }, + dailyFlightCount: async () => { + return await axios.get('api/main/dash/stcs/dailyflight'); } }; diff --git a/src/modules/main/dash/models/mainDashModel.ts b/src/modules/main/dash/models/mainDashModel.ts index 9d128ea..f6ab293 100644 --- a/src/modules/main/dash/models/mainDashModel.ts +++ b/src/modules/main/dash/models/mainDashModel.ts @@ -3,6 +3,37 @@ export interface MainDashState { stcsAreaList: StcsAreaData[] | undefined; groupList: GroupListData[] | undefined; dronList: DronListData[] | undefined; + dashboardData: IDashBoardData | undefined; +} + +export enum EDateType { + yesterday = '전일', + today = '금일', + tomorrow = '명일' +} + +export interface IDailyFlightPlan { + dateType: string; + plan: number; + aprvn: number; + count: number; + note: number; +} +export interface IDailyFlightWarn { + dateType: string; + plan: number; + altitude: number; + crash: number; + count: number; + note: number; +} + +export interface IDailyFlightCount { + dateType: string; + flightPlan: number; + completeFlight: number; + notFlight: number; + note: number; } export interface StcsDayData { @@ -29,11 +60,23 @@ export interface DronListData { groupNm: string; } +export interface IDashBoardData { + stcsDayList: StcsDayData[]; + dailyFlightWarn: IDailyFlightWarn[]; + dailyFlightCount: IDailyFlightCount[]; + dailyFlightPlan: IDailyFlightPlan[]; +} + +export interface IDashBoardRq { + stcsDay: string; +} + export const initMainDash = { stcsDayList: undefined, stcsAreaList: undefined, groupList: undefined, - dronList: undefined + dronList: undefined, + dashboardData: undefined }; // laanc 승인 목록 검색 diff --git a/src/modules/main/dash/reducers/mainDashReducer.ts b/src/modules/main/dash/reducers/mainDashReducer.ts index ad58d67..5d23869 100644 --- a/src/modules/main/dash/reducers/mainDashReducer.ts +++ b/src/modules/main/dash/reducers/mainDashReducer.ts @@ -25,10 +25,15 @@ export const mainDahReducer = createReducer< draft.groupList = data; }) ) - .handleAction(Actions.DRON_LIST.success, (state, action) => produce(state, draft => { const { data } = action.payload; draft.dronList = data; }) + ) + .handleAction(Actions.DASHBOARD_DATA.success, (state, action) => + produce(state, draft => { + const data = action.payload; + draft.dashboardData = { ...data }; + }) ); diff --git a/src/modules/main/dash/sagas/mainDashSaga.ts b/src/modules/main/dash/sagas/mainDashSaga.ts index 82a7fac..accef1f 100644 --- a/src/modules/main/dash/sagas/mainDashSaga.ts +++ b/src/modules/main/dash/sagas/mainDashSaga.ts @@ -1,4 +1,4 @@ -import { call, put, takeEvery } from '@redux-saga/core/effects'; +import { call, put, takeEvery, all } from '@redux-saga/core/effects'; import { ActionType } from 'typesafe-actions'; import * as MessageActions from '../../../comn/message/actions/comnMessageAction'; import * as Actions from '../actions/mainDashAction'; @@ -7,6 +7,7 @@ import * as Apis from '../apis/mainDashApi'; function* listStcsDay(action: ActionType) { try { const params = action.payload; + const res = yield call(Apis.mainDashAPI.stcsDay, params); const { data, count, errorCode, errorMessage } = res; if (errorCode) { @@ -116,9 +117,59 @@ function* listDron(action: ActionType) { } } +function* dashboardData( + action: ActionType +) { + try { + const params = action.payload; + + /* + stcsDayList: 일 별 비행횟수 통계 + dailyFlightPlan: 일일 비행계획 현황 통계 + dailyFlightCount: 일일 비행건수 현황 통계 + dailyFlighWarn: 일일 비정상상황 현황 통계 + */ + const { stcsDayList, dailyFlighWarn, dailyFlightPlan, dailyFlightCount } = + yield all({ + stcsDayList: call(Apis.mainDashAPI.stcsDay, { yyyymm: params.stcsDay }), + dailyFlighWarn: call(Apis.mainDashAPI.dailyFlightWarn), + dailyFlightPlan: call(Apis.mainDashAPI.dailyFlightPlan), + dailyFlightCount: call(Apis.mainDashAPI.dailyFlightCount) + }); + + // if (errorCode) { + // // 오류메시지 호출 + // yield put( + // MessageActions.IS_ERROR({ + // errorCode: errorCode, + // errorMessage: '처리중 오류가 발생하였습니다', + // isHistoryBack: false, + // isRefresh: false + // }) + // ); + + // return; + // } + yield put( + Actions.DASHBOARD_DATA.success({ + stcsDayList: stcsDayList.data, + dailyFlightWarn: dailyFlighWarn.data.slice( + 0, + dailyFlightPlan.data.length - 1 + ), + dailyFlightCount: dailyFlightCount.data, + dailyFlightPlan: dailyFlightPlan.data + }) + ); + } catch (error) { + yield put(Actions.DASHBOARD_DATA.failure(error)); + } +} + export function* mainDashSaga() { yield takeEvery(Actions.STCS_DAY.request, listStcsDay); yield takeEvery(Actions.STCS_AREA.request, listStcsArea); yield takeEvery(Actions.GROUP_LIST.request, listGroup); yield takeEvery(Actions.DRON_LIST.request, listDron); + yield takeEvery(Actions.DASHBOARD_DATA.request, dashboardData); }