Merge branch 'iipbs/sn/dev'

This commit is contained in:
2026-01-02 14:55:18 +09:00
9 changed files with 1239 additions and 1342 deletions
+1 -1
View File
@@ -15,7 +15,7 @@ NEXT_PUBLIC_GEOSERVER_URL = http://172.29.143.87:8080/geoserver
NEXT_PUBLIC_LX_GEOSERVER_URL = http://172.29.143.87:8080/geoserver_swl NEXT_PUBLIC_LX_GEOSERVER_URL = http://172.29.143.87:8080/geoserver_swl
NEXT_PUBLIC_WR_SERVER_API_URL = http://apigateway.iipbs-was.svc.cluster.local:8000/reuse-service/api/v1 NEXT_PUBLIC_WR_SERVER_API_URL = http://apigateway.iipbs-was.svc.cluster.local:8000/reuse-service/api/v1
NEXT_PUBLIC_SEWERAGE_API_URL = http://apigateway.iipbs-was.svc.cluster.local:8000/sewerage-service NEXT_PUBLIC_SEWERAGE_API_URL = http://apigateway.iipbs-was.svc.cluster.local:8000/sewerage-service
NEXT_PUBLIC_NGII_URL = http://172.29.143.87 NEXT_PUBLIC_NGII_URL = http://172.29.143.87/poiact
NEXT_PUBLIC_NGII_PARAM = BDE2BEF39DAFEC293AB6730150F222AC&service=WMTS&request=GetTile&version=1.0.0&format=image/png&layer=korean_map&style=korean&tilematrixset=korean&tilematrix={z}&tilecol={y}&tilerow={x} NEXT_PUBLIC_NGII_PARAM = BDE2BEF39DAFEC293AB6730150F222AC&service=WMTS&request=GetTile&version=1.0.0&format=image/png&layer=korean_map&style=korean&tilematrixset=korean&tilematrix={z}&tilecol={y}&tilerow={x}
+1 -1
View File
@@ -16,5 +16,5 @@ NEXT_PUBLIC_LX_GEOSERVER_URL = http://172.29.143.87:8080/geoserver_swl
NEXT_PUBLIC_WR_SERVER_API_URL = http://apigateway.iipbs-was.svc.cluster.local:8000/reuse-service/api/v1 NEXT_PUBLIC_WR_SERVER_API_URL = http://apigateway.iipbs-was.svc.cluster.local:8000/reuse-service/api/v1
NEXT_PUBLIC_SEWERAGE_API_URL = http://apigateway.iipbs-was.svc.cluster.local:8000/sewerage-service NEXT_PUBLIC_SEWERAGE_API_URL = http://apigateway.iipbs-was.svc.cluster.local:8000/sewerage-service
NEXT_PUBLIC_DC_URL = http://apigateway.iipbs-was.svc.cluster.local:8000/dc-service NEXT_PUBLIC_DC_URL = http://apigateway.iipbs-was.svc.cluster.local:8000/dc-service
NEXT_PUBLIC_NGII_URL = http://172.29.143.87 NEXT_PUBLIC_NGII_URL = http://172.29.143.87/poiact
NEXT_PUBLIC_NGII_PARAM = BDE2BEF39DAFEC293AB6730150F222AC&service=WMTS&request=GetTile&version=1.0.0&format=image/png&layer=korean_map&style=korean&tilematrixset=korean&tilematrix={z}&tilecol={y}&tilerow={x} NEXT_PUBLIC_NGII_PARAM = BDE2BEF39DAFEC293AB6730150F222AC&service=WMTS&request=GetTile&version=1.0.0&format=image/png&layer=korean_map&style=korean&tilematrixset=korean&tilematrix={z}&tilecol={y}&tilerow={x}
@@ -40,6 +40,14 @@ export const generateYearDates = (searchYear: string) => {
return dates; return dates;
} }
type FacilityType = {
bscFctCd: string;
bscFctNm: string;
fcltyCpc: number | '';
trtFrfNm: string | '';
efflWqltStndrdNm: string | '';
}
export default function DashBoard() { export default function DashBoard() {
// 입력값 상태 관리 // 입력값 상태 관리
const { Common, initializeCommonData, searchMainGraph, searchRainManage, searchOperationStatus, OperationStatus, RainManage, MainGraph, PlanFclty } = useFoStore((state) => state); const { Common, initializeCommonData, searchMainGraph, searchRainManage, searchOperationStatus, OperationStatus, RainManage, MainGraph, PlanFclty } = useFoStore((state) => state);
@@ -48,26 +56,10 @@ export default function DashBoard() {
const [filteredSigunData, setFilteredSigunData] = useState<SelectDataType[]>([{ text: "전체", val: '0' }]); const [filteredSigunData, setFilteredSigunData] = useState<SelectDataType[]>([{ text: "전체", val: '0' }]);
const [sidoValue, setSidoValue] = useState<string>('0'); const [sidoValue, setSidoValue] = useState<string>('0');
const [sigunValue, setSigunValue] = useState<string>('0'); const [sigunValue, setSigunValue] = useState<string>('0');
const { const { isInit, selectSearchYear, btnClass, selectSidoData, selectSigunData, } = Common;
isInit, const { planFcltyList } = PlanFclty;
selectSearchYear, const { operationalStatusList } = OperationStatus;
btnClass, const { excelList } = RainManage;
selectSidoData,
selectSigunData,
} = Common;
const {
planFcltyList
} = PlanFclty;
const {
operationalStatusList
} = OperationStatus;
const {
excelList
} = RainManage;
const { const {
chart_inflowRain, chart_inflowRain,
chart_bodRain, chart_bodRain,
@@ -79,10 +71,10 @@ export default function DashBoard() {
} = MainGraph; } = MainGraph;
/******************선택된 데이터******************/ /******************선택된 데이터******************/
// 연도
const [searchYear, setSearchYear] = useState<string>(selectSearchYear[0]?.val || '0'); const [searchYear, setSearchYear] = useState<string>(selectSearchYear[0]?.val || '0'); // 연도
// 시설명 // 시설명
const [fcltyList, setFcltyList] = useState<{ bscFctCd: string, bscFctNm: string, fcltyCpc: number | '', trtFrfNm: string | '', efflWqltStndrdNm: string | '' }>({ const [fcltyList, setFcltyList] = useState<FacilityType>({
bscFctCd: '11000SW001R', bscFctCd: '11000SW001R',
bscFctNm: '난지', bscFctNm: '난지',
fcltyCpc: 860000, fcltyCpc: 860000,
@@ -90,7 +82,7 @@ export default function DashBoard() {
efflWqltStndrdNm: '500톤 이상(Ⅲ지역)' efflWqltStndrdNm: '500톤 이상(Ⅲ지역)'
}); });
const [searchFcltyList, setSearchFcltyList] = useState<{ bscFctCd: string, bscFctNm: string, fcltyCpc: number | '', trtFrfNm: string | '', efflWqltStndrdNm: string | '' }>({ const [searchFcltyList, setSearchFcltyList] = useState<FacilityType>({
bscFctCd: '', bscFctCd: '',
bscFctNm: '', bscFctNm: '',
fcltyCpc: '', fcltyCpc: '',
@@ -111,7 +103,7 @@ export default function DashBoard() {
} }
}, [isInit, initializeCommonData]); }, [isInit, initializeCommonData]);
const handleFacilityChange = (facility: { bscFctCd: string, bscFctNm: string, fcltyCpc: number | '', trtFrfNm: string | '', efflWqltStndrdNm: string | '' }) => { const handleFacilityChange = (facility: FacilityType) => {
setFcltyList(facility); setFcltyList(facility);
}; };
@@ -255,60 +247,6 @@ export default function DashBoard() {
headerRange: 'A1:J1', headerRange: 'A1:J1',
sheetName: '주요그래프' sheetName: '주요그래프'
} }
/* {
data: [['날짜', '강수량'],...chart_inflowRain.map((item) => [item.label, roundNumber(item.barVal0, 1)])],
headerNum: 1,
headerRange: 'A1:B1',
sheetName: '강수량'
},
{
data: [['날짜', '유입하수량'],...chart_inflowRain.map((item) => [item.label, roundNumber(item.lineVal1, 0)])],
headerNum: 1,
headerRange: 'A1:B1',
sheetName: '유입하수량'
},
{
data: [['날짜', '시설용량'],...chart_inflowRain.map((item) => [item.label, roundNumber(item.lineVal0, 0)])],
headerNum: 1,
headerRange: 'A1:B1',
sheetName: '시설용량'
},
{
data: [['날짜', '유입BOD'],...chart_bodRain.map((item) => [item.label, roundNumber(item.lineVal0, 1)])],
headerNum: 1,
headerRange: 'A1:B1',
sheetName: '유입BOD'
},
{
data: [['날짜', '유입T-P'],...chart_inflTp.map((item) => [item.label, roundNumber(item.val, 3)])],
headerNum: 1,
headerRange: 'A1:B1',
sheetName: '유입T-P'
},
{
data: [['날짜', '총인유입T-P'],...chart_chongInTp.map((item) => [item.label, roundNumber(item.val, 3)])],
headerNum: 1,
headerRange: 'A1:B1',
sheetName: '총인유입T-P'
},
{
data: [['날짜', '방류T-P'],...chart_efflTp.map((item) => [item.label, roundNumber(item.val, 3)])],
headerNum: 1,
headerRange: 'A1:B1',
sheetName: '방류T-P'
},
{
data: [['날짜', '유입T-N'],...chart_inflTn.map((item) => [item.label, roundNumber(item.val, 3)])],
headerNum: 1,
headerRange: 'A1:B1',
sheetName: '유입T-N'
},
{
data: [['날짜', '방류T-N'],...chart_efflTn.map((item) => [item.label, roundNumber(item.val, 3)])],
headerNum: 1,
headerRange: 'A1:B1',
sheetName: '방류T-N'
} */
]; ];
downloadMultipleExcel('주요그래프', sheetParameter); downloadMultipleExcel('주요그래프', sheetParameter);
+15 -7
View File
@@ -158,12 +158,18 @@ const selectFacilityPartData:SelectDataType[] = [
// 년도 데이터 // 년도 데이터
const getYearData = () => { const getYearData = () => {
const year = new Date().getFullYear(); const today = new Date();
const year1 = year - 1; const year = today.getFullYear();
const year2 = year - 2; const month = today.getMonth() + 1;
const year3 = year - 3;
const year4 = year - 4; // 상반기(6월까지)는 2년 전, 하반기는 1년 전부터 시작
const year5 = year - 5; const startYear = month <= 6 ? (year - 2) : (year - 1);
const year1 = startYear;
const year2 = startYear - 1;
const year3 = startYear - 2;
const year4 = startYear - 3;
const year5 = startYear - 4;
return [ return [
{ text: year1 + "년", val: year1.toString() }, { text: year1 + "년", val: year1.toString() },
{ text: year2 + "년", val: year2.toString() }, { text: year2 + "년", val: year2.toString() },
@@ -436,7 +442,9 @@ export const commonState: CommonType = {
}, },
}; };
export const CommonReducer:(set:(fn: (state: CommonType) => CommonType) => void)=>CommonAction=(set: (fn: (state: CommonType) => CommonType) => void) => { export const CommonReducer = (
set: (fn: (state: CommonType) => CommonType) => void
): CommonAction => {
return { return {
// 메뉴 권한 확인 // 메뉴 권한 확인
getMenuAuth: async (menuCd: number) => { getMenuAuth: async (menuCd: number) => {
+237 -288
View File
@@ -757,125 +757,104 @@ const calcWaterQltyData = async (data: any[], searchYear : string|undefined, fcl
if (res.data.wqltObjs.length > 0) { if (res.data.wqltObjs.length > 0) {
const clone = (arr: any[]) => arr?.map(v => ({ ...v })) ?? []; const clone = (arr: any[]) => arr?.map(v => ({ ...v })) ?? [];
const qltyData = res.data.wqltObjs; const qltyData = res.data.wqltObjs;
const qltyChungchunData = CalcRainEffect(clone(qltyData), 'SUNNY'); // const qltyChungchunData = CalcRainEffect(clone(qltyData), 'SUNNY');
// 강우시 변수
let rainSummerDay9 = 0, noNullRainSummerDay9 = 0;
let rainInflBodAvg9 = 0, rainInflTnAvg9 = 0, rainInflTpAvg9 = 0;
let rainEfflBodAvg9 = 0, rainEfflTnAvg9 = 0, rainEfflTpAvg9 = 0, rainTpInflAvg9 = 0;
const qltyRainData = CalcRainEffect(clone(qltyData), 'RAIN'); const qltyRainData = CalcRainEffect(clone(qltyData), 'RAIN');
const rainEffectDayArray: string[] = [];
// (0) 전체변수 // 강우시
let summerDay = 0; qltyRainData.forEach((item: any) => {
let noNullSummerDay = 0;
let totalInflBodAvgSummer = 0;
let totalInflTnAvgSummer = 0;
let totalInflTpAvgSummer = 0;
let totalEfflBodAvgSummer = 0;
let totalEfflTnAvgSummer = 0;
let totalEfflTpAvgSummer = 0;
let totalTpInflAvgSummer = 0;
let winterDay = 0;
let noNullWinterDay = 0;
let totalInflBodAvgWinter = 0;
let totalInflTnAvgWinter = 0;
let totalInflTpAvgWinter = 0;
let totalEfflBodAvgWinter = 0;
let totalEfflTnAvgWinter = 0;
let totalEfflTpAvgWinter = 0;
let totalTpInflAvgWinter = 0;
// 전체 대상
qltyData.forEach((item: any) => {
const month = item.msrDt.substring(4, 6); // 월 추출 const month = item.msrDt.substring(4, 6); // 월 추출
if(month === '01' || month === '02'){ if (month === '06' || month === '07' || month === '08') {
winterDay += 1; rainSummerDay9 += 1;
if (item.tpInflWqltTp != null && item.tpInflWqltTp != 0) { if (item.tpInflWqltTp != null && item.tpInflWqltTp != 0) {
noNullWinterDay+=1; noNullRainSummerDay9 += 1;
} }
totalInflBodAvgWinter += nullToZero(item.inflAssctBfrWqltBod);
totalInflTnAvgWinter += nullToZero(item.inflAssctBfrWqltTn); rainInflBodAvg9 += nullToZero(item.inflAssctBfrWqltBod);
totalInflTpAvgWinter += nullToZero(item.inflAssctBfrWqltTp); rainInflTnAvg9 += nullToZero(item.inflAssctBfrWqltTn);
totalEfflBodAvgWinter += nullToZero(item.efflWqltBod); rainInflTpAvg9 += nullToZero(item.inflAssctBfrWqltTp);
totalEfflTnAvgWinter += nullToZero(item.efflWqltTn); rainEfflBodAvg9 += nullToZero(item.efflWqltBod);
totalEfflTpAvgWinter += nullToZero(item.efflWqltTp); rainEfflTnAvg9 += nullToZero(item.efflWqltTn);
totalTpInflAvgWinter += nullToZero(item.tpInflWqltTp); rainEfflTpAvg9 += nullToZero(item.efflWqltTp);
}else if(month === '06' || month === '07' || month === '08'){ rainTpInflAvg9 += nullToZero(item.tpInflWqltTp);
summerDay += 1;
if(item.tpInflWqltTp != null && item.tpInflWqltTp != 0){
noNullSummerDay+=1;
}
totalInflBodAvgSummer += nullToZero(item.inflAssctBfrWqltBod);
totalInflTnAvgSummer += nullToZero(item.inflAssctBfrWqltTn);
totalInflTpAvgSummer += nullToZero(item.inflAssctBfrWqltTp);
totalEfflBodAvgSummer += nullToZero(item.efflWqltBod);
totalEfflTnAvgSummer += nullToZero(item.efflWqltTn);
totalEfflTpAvgSummer += nullToZero(item.efflWqltTp);
totalTpInflAvgSummer += nullToZero(item.tpInflWqltTp);
} }
}); });
console.log("99999999999999999");
console.log(rainSummerDay9, noNullRainSummerDay9, rainInflBodAvg9, rainInflTnAvg9, rainInflTpAvg9, rainEfflBodAvg9, rainEfflTnAvg9, rainEfflTpAvg9, rainTpInflAvg9);
orgData[5].winterAll = qltyDataSetting(totalInflBodAvgWinter, winterDay, 1); // 동절기 유입BOD // (0) 전체변수
orgData[6].winterAll = qltyDataSetting(totalEfflBodAvgWinter, winterDay, 1); // 동절기 방류BOD let summerDay = 0, noNullSummerDay = 0;
orgData[7].winterAll = qltyDataSetting(totalInflTnAvgWinter, winterDay, 3); // 동절기 유입TN let totalInflBodAvgSummer = 0, totalInflTnAvgSummer = 0, totalInflTpAvgSummer = 0;
orgData[8].winterAll = qltyDataSetting(totalEfflTnAvgWinter, winterDay, 3); // 동절기 방류TN let totalEfflBodAvgSummer = 0, totalEfflTnAvgSummer = 0, totalEfflTpAvgSummer = 0, totalTpInflAvgSummer = 0;
orgData[9].winterAll = qltyDataSetting(totalInflTpAvgWinter, winterDay, 3); // 동절기 유입TP
orgData[10].winterAll = qltyDataSetting(totalEfflTpAvgWinter, winterDay, 3); // 동절기 방류TP
//총인설비 let winterDay = 0, noNullWinterDay = 0;
orgData[11].winterAll = qltyDataSetting(totalTpInflAvgWinter, noNullWinterDay, 3); let totalInflBodAvgWinter = 0, totalInflTnAvgWinter = 0, totalInflTpAvgWinter = 0;
orgData[12].winterAll = qltyDataSetting(totalEfflTpAvgWinter, winterDay, 3); let totalEfflBodAvgWinter = 0, totalEfflTnAvgWinter = 0, totalEfflTpAvgWinter = 0, totalTpInflAvgWinter = 0;
orgData[5].summerAll = qltyDataSetting(totalInflBodAvgSummer, summerDay, 1); // 하절기 유입BOD
orgData[6].summerAll = qltyDataSetting(totalEfflBodAvgSummer, summerDay, 1); // 하절기 방류BOD
orgData[7].summerAll = qltyDataSetting(totalInflTnAvgSummer, summerDay, 3); // 하절기 유입TN
orgData[8].summerAll = qltyDataSetting(totalEfflTnAvgSummer, summerDay, 3); // 하절기 방류TN
orgData[9].summerAll = qltyDataSetting(totalInflTpAvgSummer, summerDay, 3); // 하절기 유입TP
orgData[10].summerAll = qltyDataSetting(totalEfflTpAvgSummer, summerDay, 3); // 하절기 방류TP
//총인설비
orgData[11].summerAll = qltyDataSetting(totalTpInflAvgSummer, noNullSummerDay, 3);
orgData[12].summerAll = qltyDataSetting(totalEfflTpAvgSummer, summerDay, 3);
// (1) 청천시 변수 // (1) 청천시 변수
// (1-1) 날짜 count // (1-1) 날짜 count
let chungchunSummerDay = 0; let chungchunSummerDay = 0, noNullChungchunSummerDay = 0;
let chungchunWinterDay = 0; let chungchunWinterDay = 0, noNullChungchunWinterDay = 0;
let noNullChungchunSummerDay = 0;
let noNullChungchunWinterDay = 0;
// (1-2) 하절기 // (1-2) 하절기
let chungchunInflBodAvgSummer = 0; // 하절기 청천시 유입BOD let chungchunInflBodAvgSummer = 0, chungchunInflTnAvgSummer = 0, chungchunInflTpAvgSummer = 0;
let chungchunInflTnAvgSummer = 0; // 하절기 청천시 유입TN let chungchunEfflBodAvgSummer = 0, chungchunEfflTnAvgSummer = 0, chungchunEfflTpAvgSummer = 0;
let chungchunInflTpAvgSummer = 0; // 하절기 청천시 유입TP
let chungchunEfflBodAvgSummer = 0; // 하절기 청천시 방류BOD
let chungchunEfflTnAvgSummer = 0; // 하절기 청천시 방류TN
let chungchunEfflTpAvgSummer = 0; // 하절기 청천시 방류TP
let chungchunTpInflAvgSummer = 0; // 하절기 청천시 총인설비 유입TP let chungchunTpInflAvgSummer = 0; // 하절기 청천시 총인설비 유입TP
// (1-3) 동절기 (최대, 최소, 평균 다 필요) // (1-3) 동절기 (최대, 최소, 평균 다 필요)
let chungchunInflBodAvg = 0; let chungchunInflBodAvg = 0, chungchunInflTnAvg = 0, chungchunInflTpAvg = 0, chungchunTpInflAvg = 0;
let chungchunInflTnAvg = 0; let chungchunInflBodMax = 0, chungchunInflTnMax = 0, chungchunInflTpMax = 0, chungchunTpInflMax = 0;
let chungchunInflTpAvg = 0;
let chungchunTpInflAvg = 0;
let chungchunInflBodMax = 0;
let chungchunInflTnMax = 0;
let chungchunInflTpMax = 0;
let chungchunTpInflMax = 0;
let chungchunInflBodMin = 99999999; let chungchunInflBodMin = 99999999;
let chungchunInflTnMin = 99999999; let chungchunInflTnMin = 99999999;
let chungchunInflTpMin = 99999999; let chungchunInflTpMin = 99999999;
let chungchunTpInflMin = 99999999; let chungchunTpInflMin = 99999999;
let chungchunEfflBodAvg = 0; let chungchunEfflBodAvg = 0, chungchunEfflTnAvg = 0, chungchunEfflTpAvg = 0;
let chungchunEfflTnAvg = 0; let chungchunEfflBodMax = 0, chungchunEfflTnMax = 0, chungchunEfflTpMax = 0;
let chungchunEfflTpAvg = 0;
let chungchunEfflBodMax = 0;
let chungchunEfflTnMax = 0;
let chungchunEfflTpMax = 0;
let chungchunEfflBodMin = 99999999; let chungchunEfflBodMin = 99999999;
let chungchunEfflTnMin = 99999999; let chungchunEfflTnMin = 99999999;
let chungchunEfflTpMin = 99999999; let chungchunEfflTpMin = 99999999;
// 청천시 // 강우시 변수
qltyChungchunData.forEach((item: any) => { let rainSummerDay = 0, noNullRainSummerDay = 0;
let rainInflBodAvg = 0, rainInflTnAvg = 0, rainInflTpAvg = 0;
let rainEfflBodAvg = 0, rainEfflTnAvg = 0, rainEfflTpAvg = 0, rainTpInflAvg = 0;
let rainEffectDay = 0;
// 전체 대상
qltyData.forEach((item: any) => {
if (item.infoRnDay == null) item.infoRnDay = 0;
const month = item.msrDt.substring(4, 6); // 월 추출 const month = item.msrDt.substring(4, 6); // 월 추출
if (item.infoRnDay >= 3) {
rainEffectDay = 2;
} else {
rainEffectDay--;
}
if (rainEffectDay >= 0) {
rainEffectDayArray.push(item.msrDt);
// 강우영향일
if (month === '06' || month === '07' || month === '08') {
rainSummerDay += 1;
if (item.tpInflWqltTp != null && item.tpInflWqltTp != 0) {
noNullRainSummerDay += 1;
}
rainInflBodAvg += nullToZero(item.inflAssctBfrWqltBod);
rainInflTnAvg += nullToZero(item.inflAssctBfrWqltTn);
rainInflTpAvg += nullToZero(item.inflAssctBfrWqltTp);
rainEfflBodAvg += nullToZero(item.efflWqltBod);
rainEfflTnAvg += nullToZero(item.efflWqltTn);
rainEfflTpAvg += nullToZero(item.efflWqltTp);
rainTpInflAvg += nullToZero(item.tpInflWqltTp);
}
} else if (rainEffectDay < 0) { //청천시
if (month === '01' || month === '02') { if (month === '01' || month === '02') {
chungchunWinterDay += 1; chungchunWinterDay += 1;
if (item.tpInflWqltTp != null && item.tpInflWqltTp != 0) { if (item.tpInflWqltTp != null && item.tpInflWqltTp != 0) {
@@ -927,8 +906,59 @@ const calcWaterQltyData = async (data: any[], searchYear : string|undefined, fcl
chungchunEfflTpAvgSummer += nullToZero(item.efflWqltTp); chungchunEfflTpAvgSummer += nullToZero(item.efflWqltTp);
chungchunTpInflAvgSummer += nullToZero(item.tpInflWqltTp); chungchunTpInflAvgSummer += nullToZero(item.tpInflWqltTp);
} }
}
if (month === '01' || month === '02') {
winterDay += 1;
if (item.tpInflWqltTp != null && item.tpInflWqltTp != 0) {
noNullWinterDay += 1;
}
totalInflBodAvgWinter += nullToZero(item.inflAssctBfrWqltBod);
totalInflTnAvgWinter += nullToZero(item.inflAssctBfrWqltTn);
totalInflTpAvgWinter += nullToZero(item.inflAssctBfrWqltTp);
totalEfflBodAvgWinter += nullToZero(item.efflWqltBod);
totalEfflTnAvgWinter += nullToZero(item.efflWqltTn);
totalEfflTpAvgWinter += nullToZero(item.efflWqltTp);
totalTpInflAvgWinter += nullToZero(item.tpInflWqltTp);
} else if (month === '06' || month === '07' || month === '08') {
summerDay += 1;
if (item.tpInflWqltTp != null && item.tpInflWqltTp != 0) {
noNullSummerDay += 1;
}
totalInflBodAvgSummer += nullToZero(item.inflAssctBfrWqltBod);
totalInflTnAvgSummer += nullToZero(item.inflAssctBfrWqltTn);
totalInflTpAvgSummer += nullToZero(item.inflAssctBfrWqltTp);
totalEfflBodAvgSummer += nullToZero(item.efflWqltBod);
totalEfflTnAvgSummer += nullToZero(item.efflWqltTn);
totalEfflTpAvgSummer += nullToZero(item.efflWqltTp);
totalTpInflAvgSummer += nullToZero(item.tpInflWqltTp);
}
}); });
orgData[5].winterAll = qltyDataSetting(totalInflBodAvgWinter, winterDay, 1); // 동절기 유입BOD
orgData[6].winterAll = qltyDataSetting(totalEfflBodAvgWinter, winterDay, 1); // 동절기 방류BOD
orgData[7].winterAll = qltyDataSetting(totalInflTnAvgWinter, winterDay, 3); // 동절기 유입TN
orgData[8].winterAll = qltyDataSetting(totalEfflTnAvgWinter, winterDay, 3); // 동절기 방류TN
orgData[9].winterAll = qltyDataSetting(totalInflTpAvgWinter, winterDay, 3); // 동절기 유입TP
orgData[10].winterAll = qltyDataSetting(totalEfflTpAvgWinter, winterDay, 3); // 동절기 방류TP
//총인설비
orgData[11].winterAll = qltyDataSetting(totalTpInflAvgWinter, noNullWinterDay, 3);
orgData[12].winterAll = qltyDataSetting(totalEfflTpAvgWinter, winterDay, 3);
orgData[5].summerAll = qltyDataSetting(totalInflBodAvgSummer, summerDay, 1); // 하절기 유입BOD
orgData[6].summerAll = qltyDataSetting(totalEfflBodAvgSummer, summerDay, 1); // 하절기 방류BOD
orgData[7].summerAll = qltyDataSetting(totalInflTnAvgSummer, summerDay, 3); // 하절기 유입TN
orgData[8].summerAll = qltyDataSetting(totalEfflTnAvgSummer, summerDay, 3); // 하절기 방류TN
orgData[9].summerAll = qltyDataSetting(totalInflTpAvgSummer, summerDay, 3); // 하절기 유입TP
orgData[10].summerAll = qltyDataSetting(totalEfflTpAvgSummer, summerDay, 3); // 하절기 방류TP
//총인설비
orgData[11].summerAll = qltyDataSetting(totalTpInflAvgSummer, noNullSummerDay, 3);
orgData[12].summerAll = qltyDataSetting(totalEfflTpAvgSummer, summerDay, 3);
// 청천시 수질 데이터 수정 // 청천시 수질 데이터 수정
// 하절기 // 하절기
orgData[5].summerRain = qltyDataSetting(chungchunInflBodAvgSummer, chungchunSummerDay, 1); orgData[5].summerRain = qltyDataSetting(chungchunInflBodAvgSummer, chungchunSummerDay, 1);
@@ -972,37 +1002,6 @@ const calcWaterQltyData = async (data: any[], searchYear : string|undefined, fcl
orgData[11].winterSunnyMin = chungchunTpInflMin === 99999999 ? '0.000' : roundUp(chungchunTpInflMin, 3).toFixed(3); orgData[11].winterSunnyMin = chungchunTpInflMin === 99999999 ? '0.000' : roundUp(chungchunTpInflMin, 3).toFixed(3);
orgData[12].winterSunnyMin = chungchunInflTpMin === 99999999 ? '0.000' : roundUp(chungchunInflTpMin, 3).toFixed(3); orgData[12].winterSunnyMin = chungchunInflTpMin === 99999999 ? '0.000' : roundUp(chungchunInflTpMin, 3).toFixed(3);
// 강우시 변수
let rainSummerDay = 0;
let noNullRainSummerDay = 0;
let rainInflBodAvg = 0;
let rainInflTnAvg = 0;
let rainInflTpAvg = 0;
let rainEfflBodAvg = 0;
let rainEfflTnAvg = 0;
let rainEfflTpAvg = 0;
let rainTpInflAvg = 0;
// 강우시
qltyRainData.forEach((item: any) => {
const month = item.msrDt.substring(4, 6); // 월 추출
if(month === '06' || month === '07' || month === '08'){
rainSummerDay += 1;
if(item.tpInflWqltTp != null && item.tpInflWqltTp != 0){
noNullRainSummerDay+=1;
}
rainInflBodAvg += nullToZero(item.inflAssctBfrWqltBod);
rainInflTnAvg += nullToZero(item.inflAssctBfrWqltTn);
rainInflTpAvg += nullToZero(item.inflAssctBfrWqltTp);
rainEfflBodAvg += nullToZero(item.efflWqltBod);
rainEfflTnAvg += nullToZero(item.efflWqltTn);
rainEfflTpAvg += nullToZero(item.efflWqltTp);
rainTpInflAvg += nullToZero(item.tpInflWqltTp);
}
});
// 강우시 수질 데이터 수정 // 강우시 수질 데이터 수정
orgData[5].summerThree = qltyDataSetting(rainInflBodAvg, rainSummerDay, 1); orgData[5].summerThree = qltyDataSetting(rainInflBodAvg, rainSummerDay, 1);
orgData[6].summerThree = qltyDataSetting(rainEfflBodAvg, rainSummerDay, 1); orgData[6].summerThree = qltyDataSetting(rainEfflBodAvg, rainSummerDay, 1);
@@ -1014,6 +1013,8 @@ const calcWaterQltyData = async (data: any[], searchYear : string|undefined, fcl
// 총인설비 // 총인설비
orgData[11].summerThree = qltyDataSetting(rainTpInflAvg, noNullRainSummerDay, 3); orgData[11].summerThree = qltyDataSetting(rainTpInflAvg, noNullRainSummerDay, 3);
orgData[12].summerThree = qltyDataSetting(rainInflTpAvg, rainSummerDay, 3); orgData[12].summerThree = qltyDataSetting(rainInflTpAvg, rainSummerDay, 3);
console.log(rainEffectDayArray);
console.log("000000000", rainSummerDay, noNullRainSummerDay, rainInflBodAvg, rainInflTnAvg, rainInflTpAvg, rainEfflBodAvg, rainEfflTnAvg, rainEfflTpAvg, rainTpInflAvg);
return orgData; return orgData;
} else { } else {
@@ -1288,7 +1289,9 @@ const searchWaterUsage = async (searchYear: string, fcltyCd: string) => {
return waterUsage; return waterUsage;
} }
export const dashBoardReducer:(set:(fn: (state: DashBoardType) => DashBoardType) => void)=>DashBoardActions=(set: (fn: (state: DashBoardType) => DashBoardType) => void) => { export const dashBoardReducer = (
set: (fn: (state: DashBoardType) => DashBoardType) => void
): DashBoardActions => {
return { return {
initializeDashBoardData: async () => { initializeDashBoardData: async () => {
set((state: DashBoardType) => ({ set((state: DashBoardType) => ({
@@ -1310,7 +1313,7 @@ export const dashBoardReducer:(set:(fn: (state: DashBoardType) => DashBoardType)
}, },
})); }));
let waterUsage = [0, 0, 0]; let waterUsage = [0, 0, 0];
waterUsage = await searchWaterUsage(targetYear, fcltyCd); waterUsage = await searchWaterUsage(targetYear, fcltyCd); // /fclt/flow/{fcltyCd}/{year}
set((state: DashBoardType) => ({ set((state: DashBoardType) => ({
...state, ...state,
@@ -1322,8 +1325,7 @@ export const dashBoardReducer:(set:(fn: (state: DashBoardType) => DashBoardType)
}, },
})); }));
const res = await fetchFacilityPlan(targetYear, fcltyCd, set); const res = await fetchFacilityPlan(targetYear, fcltyCd, set); // /dc-service/api/v1/nowDmgMtncGnsvy
let minDiff = 9999999; let minDiff = 9999999;
let minIndex; let minIndex;
res.forEach((el: any, idx) => { res.forEach((el: any, idx) => {
@@ -1402,37 +1404,21 @@ export const dashBoardReducer:(set:(fn: (state: DashBoardType) => DashBoardType)
const res = await fetchOperationStatus(searchYear, fcltyCd); // /dashBoard/mngInfo/ const res = await fetchOperationStatus(searchYear, fcltyCd); // /dashBoard/mngInfo/
const data = res.data; const data = res.data;
let yearMaxSumFlow = 1; // 연간운영실태 최대 let yearMaxSumFlow = 1, yearMinSumFlow = 1, yearAvgSumFlow = 1; // 연간 최대, 최소, 평균
let yearMinSumFlow = 1; // 연간운영실태 최소
let yearAvgSumFlow = 1; // 연간운영실태 평균
let summerAll = 1; // 하절기 전기간 let summerAll = 1; // 하절기 전기간
let summerThree = 1; // 하절기 let summerThree = 1; // 하절기
let summerRain = 1; // 하절기 let summerRain = 1; // 하절기
let winterAll = 1; // 동절기 전기간 let winterAll = 1; // 동절기 전기간
let winterSunnyMin = 1; // 동절기 청천 최소 let winterSunnyMin = 1, winterSunnyAvg = 1, winterSunnyMax = 1; // 동절기 청천 최소, 평균, 최대
let winterSunnyAvg = 1; // 동절기 청천 평균
let winterSunnyMax = 1; // 동절기 청천 최대
// 최대, 최소 총 유입량 (1년 하루 합계의 최대, 최소) // 최대, 최소 총 유입량 (1년 하루 합계의 최대, 최소)
// 하절기 청천시, 강우시 재계산 리턴값 // 하절기 청천시, 강우시 재계산 리턴값
let summerChungchunFlow = 1; // 하절기 청천 let summerChungchunFlow = 1, summerChungchunReturnAmnt = 1, summerChungchunEfflAmnt = 1; // 하절기 청천
let summerChungchunReturnAmnt = 1; // 하절기 청천 let summerRainInflAmnt = 1, summerRainReturnAmnt = 1, summerRainEfflAmnt = 1; // 하절기 강우시
let summerChungchunEfflAmnt = 1; // 하절기 청천
let summerRainInflAmnt = 1; // 하절기 강우시
let summerRainReturnAmnt = 1; // 하절기 강우시
let summerRainEfflAmnt = 1; // 하절기 강우시
// 동절기 청천시 최대, 최소, 평균 리턴값 // 동절기 청천시 최대, 최소, 평균 리턴값
let winterChungchunFlowAvg = 1; // 동절기 청천 하수유입량 평균 let winterChungchunFlowAvg = 1, winterChungchunFlowMax = 1, winterChungchunFlowMin = 1; // 동절기 청천 하수유입량 평균, 최대, 최소
let winterChungchunFlowMax = 1; // 동절기 청천 하수유입량 최대 let winterChungchunReturnAvg = 1, winterChungchunReturnMax = 1, winterChungchunReturnMin = 1; // 동절기 청천 총인반류수 평균, 최대, 최소
let winterChungchunFlowMin = 1; // 동절기 청천 하수유입량 최소 let winterChungchunEfflAvg = 1, winterChungchunEfflMax = 1, winterChungchunEfflMin = 1; // 동절기 청천 방류량 평균, 최대, 최소
let winterChungchunReturnAvg = 1; // 동절기 청천 총인반류수 평균
let winterChungchunReturnMax = 1; // 동절기 청천 총인반류수 최대
let winterChungchunReturnMin = 1; // 동절기 청천 총인반류수 최소
let winterChungchunEfflAvg = 1; // 동절기 청천 방류량 평균
let winterChungchunEfflMax = 1; // 동절기 청천 방류량 최대
let winterChungchunEfflMin = 1; // 동절기 청천 방류량 최소
const clone = (arr: any[]) => arr?.map(v => ({ ...v })) ?? []; const clone = (arr: any[]) => arr?.map(v => ({ ...v })) ?? [];
@@ -1457,12 +1443,11 @@ export const dashBoardReducer:(set:(fn: (state: DashBoardType) => DashBoardType)
(data.yearData.MIN_SUM_FLOW ? data.yearData.MIN_SUM_FLOW : 0) + // api 주석처리되어 있음. (data.yearData.MIN_SUM_FLOW ? data.yearData.MIN_SUM_FLOW : 0) + // api 주석처리되어 있음.
(data.yearData.MIN_RETURN_AMNT ? data.yearData.MIN_RETURN_AMNT : 0) // 반류수유량(m³/일) 최소 (data.yearData.MIN_RETURN_AMNT ? data.yearData.MIN_RETURN_AMNT : 0) // 반류수유량(m³/일) 최소
); );
operationalStatusList[0].yearAvg = yearAvg; // 연간유입평균
operationalStatusList[0].yearAvg = yearAvg; operationalStatusList[0].yearMax = yearMax; // 연간유입최대
operationalStatusList[0].yearMax = yearMax; operationalStatusList[0].yearMin = yearMin; // 연간유입최소
operationalStatusList[0].yearMin = yearMin; // 하절기
// 여름 operationalStatusList[0].summerAll = data.summer === null ? '' : ( // 하절기전기간
operationalStatusList[0].summerAll = data.summer === null ? '' : (
(data.summer.AVG_INFL_AMNT ? data.summer.AVG_INFL_AMNT : 0) + (data.summer.AVG_INFL_AMNT ? data.summer.AVG_INFL_AMNT : 0) +
(data.summer.AVG_SUM_FLOW ? data.summer.AVG_SUM_FLOW : 0) (data.summer.AVG_SUM_FLOW ? data.summer.AVG_SUM_FLOW : 0)
); );
@@ -1474,7 +1459,7 @@ export const dashBoardReducer:(set:(fn: (state: DashBoardType) => DashBoardType)
(data.summerSunny.AVG_INFL_AMNT ? data.summerSunny.AVG_INFL_AMNT : 0) + (data.summerSunny.AVG_INFL_AMNT ? data.summerSunny.AVG_INFL_AMNT : 0) +
(data.summerSunny.AVG_SUM_FLOW ? data.summerSunny.AVG_SUM_FLOW : 0) (data.summerSunny.AVG_SUM_FLOW ? data.summerSunny.AVG_SUM_FLOW : 0)
); );
// 겨울 // 동절기
operationalStatusList[0].winterAll = data.winter === null ? '' : ( // 동절기 전기간 operationalStatusList[0].winterAll = data.winter === null ? '' : ( // 동절기 전기간
(data.winter.AVG_INFL_AMNT ? data.winter.AVG_INFL_AMNT : 0) + (data.winter.AVG_INFL_AMNT ? data.winter.AVG_INFL_AMNT : 0) +
(data.winter.AVG_SUM_FLOW ? data.winter.AVG_SUM_FLOW : 0) + (data.winter.AVG_SUM_FLOW ? data.winter.AVG_SUM_FLOW : 0) +
@@ -1495,159 +1480,127 @@ export const dashBoardReducer:(set:(fn: (state: DashBoardType) => DashBoardType)
(data.winterSunny.MAX_SUM_FLOW ? data.winterSunny.MAX_SUM_FLOW : 0) + (data.winterSunny.MAX_SUM_FLOW ? data.winterSunny.MAX_SUM_FLOW : 0) +
(data.winterSunny.MAX_TP_INFL_WQLT_TP ? data.winterSunny.MAX_TP_INFL_WQLT_TP : 0) (data.winterSunny.MAX_TP_INFL_WQLT_TP ? data.winterSunny.MAX_TP_INFL_WQLT_TP : 0)
); );
// 연계처리수 // 연계처리수
let yearDay = 0; let yearDay = 0, summerDay = 0, winterDay = 0; // 연간 일수, 하절기 일수, 동절기 일수
let summerDay = 0; let summerRainDay = 0, summerChungchunDay = 0, winterChungchuDay = 0; // 하절기 강우 일수, 하절기 청천 일수, 동절기 청천 일수
let winterDay = 0; let totFlowMax = 0, totFlowMin = 9999999;
let summerRainDay = 0; let yearSumFlow = 0, maxYearSumFlow = 0, minYearSumFlow = 9999999;
let summerChungchunDay = 0; let summerSumFlow = 0, summerChungchunSumFlow = 0, summerRainDaySumFlow = 0; // 하절기 유입량 합, 하절기 청천 유입량 합, 하절기 강우 유입량 합
let winterChungchuDay = 0; let summerRainDayFlow = 0, summerRainDayReturnFlow = 0, summerRainDayEfflFlow = 0; // 하절기 강우 유입량, 하절기 강우 반류량, 하절기 강우 방류량
let winterSumFlow = 0; // 동절기 유입량 합
let totFlowMax = 0; let winterChungchunSumFlow = 0; // 동절기 청천 유입량 합
let totFlowMin = 9999999; let maxWinterChungchunSumFlow = 0, minWinterChungchunSumFlow = 9999999;
let yearSumFlow = 0;
let maxYearSumFlow = 0;
let minYearSumFlow = 9999999;
let summerSumFlow = 0;
let summerChungchunSumFlow = 0;
let summerRainDaySumFlow = 0;
let summerRainDayFlow = 0;
let summerRainDayReturnFlow = 0;
let summerRainDayEfflFlow = 0;
let winterSumFlow = 0;
let winterChungchunSumFlow = 0;
let minWinterChungchunSumFlow = 9999999;
let maxWinterChungchunSumFlow = 0;
// 연계처리수,지하수유입량 // 연계처리수,지하수유입량
const bscFctCd = fcltyCd; const bscFctCd = fcltyCd;
const res2 = await fetchFlowRateModalList(bscFctCd, searchYear); // /fclt/flow/ const res2 = await fetchFlowRateModalList(bscFctCd, searchYear); // /fclt/flow/
yearDay = res2.data?res2.data.length:1;
res2.data.forEach((item: any) => {
yearSumFlow += item.sumFlow && item.sumFlow !== 'x' ? Number(item.sumFlow.toString().trim()) : 0;
if(maxYearSumFlow < (item.sumFlow && item.sumFlow !== 'x' ? Number(item.sumFlow.toString().trim()) : 0)) {
maxYearSumFlow = item.sumFlow && item.sumFlow !== 'x' ? Number(item.sumFlow.toString().trim()) : 0;
}
if(minYearSumFlow > (item.sumFlow && item.sumFlow !== 'x' ? Number(item.sumFlow.toString().trim()) : 0)) {
minYearSumFlow = item.sumFlow && item.sumFlow !== 'x' ? Number(item.sumFlow.toString().trim()) : 0;
}
// 1년 최대 총 하수유입량 //const calData = CalcRainEffect(clone(res2.data), 'SUNNY');
let totYearFlow = 0; //const calRainData = CalcRainEffect(clone(res2.data), 'RAIN');
totYearFlow = (item.inflAmnt && item.inflAmnt !== 'x' ? Number(item.inflAmnt.toString().trim()) : 0) + (item.sumFlow && item.sumFlow !== 'x' ? Number(item.sumFlow.toString().trim()) : 0) + (item.returnAmnt && item.returnAmnt !== 'x' ? Number(item.returnAmnt.toString().trim()) : 0);
if(totFlowMax < totYearFlow) {
totFlowMax = totYearFlow;
}
if(totFlowMin > totYearFlow || totFlowMin === 0) {
totFlowMin = totYearFlow;
}
if(item.msrDt.substring(4,6) === '06' || item.msrDt.substring(4,6) === '07' || item.msrDt.substring(4,6) === '08') {
summerDay += 1;
summerSumFlow += item.sumFlow && item.sumFlow !== 'x' ? Number(item.sumFlow.toString().trim()) : 0;
} else if(item.msrDt.substring(4,6) === '01' || item.msrDt.substring(4,6) === '02') {
winterDay += 1;
winterSumFlow += item.sumFlow && item.sumFlow !== 'x' ? Number(item.sumFlow.toString().trim()) : 0;
}
});
const calData = CalcRainEffect(clone(res2.data), 'SUNNY');
const calRainData = CalcRainEffect(clone(res2.data), 'RAIN');
let cntSunnyDay = 0; // 청천일 수
// 지하수유입량 - 청천시 기준 // 지하수유입량 - 청천시 기준
let chungcunSumFlow = 0; let chungcunSumFlow = 0;
let sumSummerChungcunFlow = 0; let sumSummerChungcunFlow = 0;
let sumWinterChungcunFlow = 0; let sumWinterChungcunFlow = 0;
let summerChungchunDayReturnAmnt = 0; // 하절기 청천시 총인설비 반류수
let summerChungchunDayEfflAmnt = 0; // 하절기 청천시 총인설비 방류수
// 하절기 청천시 총인설비 반류수 let winterChungchunTotalInflAmntMax = 0, winterChungchunTotalInflAmntMin = 9999999; // 동절기 총 유입량 최대, 최소
let summerChungchunDayReturnAmnt = 0; let winterChungchunDayFlowMax = 0, winterChungchunDayFlowMin = 9999999; // 동절기 청천시 하수유입량 최대, 최소
// 하절기 청천시 방류수 let winterChungchunDayReturnMax = 0, winterChungchunDayReturnMin = 9999999; // 동절기 청천시 총인반류수 최대, 최소, 평균
let summerChungchunDayEfflAmnt = 0;
// 동절기 총 유입량 최대, 최소
let winterChungchunTotalInflAmntMax = 0 ;
let winterChungchunTotalInflAmntMin = 9999999 ;
// 동절기 청천시 하수유입량 최대, 최소
let winterChungchunDayFlowMax = 0 ;
let winterChungchunDayFlowMin = 9999999 ;
// 동절기 청천시 총인반류수 최대, 최소, 평균
let winterChungchunDayReturnMax = 0 ;
let winterChungchunDayReturnMin = 9999999 ;
let winterChungchunDayReturnAvg = 0; let winterChungchunDayReturnAvg = 0;
// 동절기 청천시 방류량 최대, 최소, 평균 // 동절기 청천시 방류량 최대, 최소, 평균
let winterChungchunDayEfflMax = 0 ; let winterChungchunDayEfflMax = 0, winterChungchunDayEfflMin = 9999999, winterChungchunDayEfflAvg = 0;
let winterChungchunDayEfflMin = 9999999 ;
let winterChungchunDayEfflAvg = 0;
// 하절기, 동절기 청천시 계산 let rainEffectDay = 0;
calData.forEach((flowItem: any) => { yearDay = res2.data ? res2.data.length : 1;
chungcunSumFlow += flowItem.inflAmnt && flowItem.inflAmnt !== 'x' ? Number(flowItem.inflAmnt.toString().trim()) : 0; res2.data.forEach((item: any) => {
if(flowItem.msrDt.substring(4,6) ==='06' || flowItem.msrDt.substring(4,6) ==='07' || flowItem.msrDt.substring(4,6) ==='08'){ const month = item.msrDt.substring(4, 6); // 월 추출
const sumFlow = item.sumFlow && item.sumFlow !== 'x' ? Number(item.sumFlow.toString().trim()) : 0;
const inflAmnt = item.inflAmnt && item.inflAmnt !== 'x' ? Number(item.inflAmnt.toString().trim()) : 0;
const returnAmnt = item.returnAmnt && item.returnAmnt !== 'x' ? Number(item.returnAmnt.toString().trim()) : 0;
const efflAmnt = item.efflAmnt && item.efflAmnt !== 'x' ? Number(item.efflAmnt.toString().trim()) : 0;
if (item.infoRnDay == null) item.infoRnDay = 0;
if (item.infoRnDay >= 3) {
rainEffectDay = 2;
// 강우시
} else {
rainEffectDay--;
}
if (rainEffectDay >= 0) {
// 강우영향일
if (month === '06' || month === '07' || month === '08') { // 하절기
summerRainDay += 1;
summerRainDaySumFlow += sumFlow;
summerRainDayFlow += inflAmnt;
summerRainDayReturnFlow += returnAmnt;
summerRainDayEfflFlow += efflAmnt;
}
} else if (rainEffectDay < 0) {
cntSunnyDay += 1; // 청천일수
// 청천시
chungcunSumFlow += inflAmnt;
if (month === '06' || month === '07' || month === '08') { // 하절기
summerChungchunDay += 1; summerChungchunDay += 1;
summerChungchunSumFlow += flowItem.sumFlow && flowItem.sumFlow !== 'x' ? Number(flowItem.sumFlow.toString().trim()) : 0; summerChungchunSumFlow += sumFlow;
sumSummerChungcunFlow += flowItem.inflAmnt && flowItem.inflAmnt !== 'x' ? Number(flowItem.inflAmnt.toString().trim()) : 0; sumSummerChungcunFlow += inflAmnt;
summerChungchunDayReturnAmnt += flowItem.returnAmnt && flowItem.returnAmnt !== 'x' ? Number(flowItem.returnAmnt.toString().trim()) : 0; summerChungchunDayReturnAmnt += returnAmnt;
summerChungchunDayEfflAmnt += flowItem.efflAmnt && flowItem.efflAmnt !== 'x' ? Number(flowItem.efflAmnt.toString().trim()) : 0; summerChungchunDayEfflAmnt += efflAmnt;
}else if(flowItem.msrDt.substring(4,6) ==='01' || flowItem.msrDt.substring(4,6) ==='02'){ } else if (month === '01' || month === '02') { // 동절기
winterChungchuDay += 1; winterChungchuDay += 1;
winterChungchunSumFlow += flowItem.sumFlow && flowItem.sumFlow !== 'x' ? Number(flowItem.sumFlow.toString().trim()) : 0; winterChungchunSumFlow += sumFlow;
sumWinterChungcunFlow += flowItem.inflAmnt && flowItem.inflAmnt !== 'x' ? Number(flowItem.inflAmnt.toString().trim()) : 0; sumWinterChungcunFlow += inflAmnt;
winterChungchunDayReturnAvg += flowItem.returnAmnt && flowItem.returnAmnt !== 'x' ? Number(flowItem.returnAmnt.toString().trim()) : 0; winterChungchunDayReturnAvg += returnAmnt;
winterChungchunDayEfflAvg += flowItem.efflAmnt && flowItem.efflAmnt !== 'x' ? Number(flowItem.efflAmnt.toString().trim()) : 0; winterChungchunDayEfflAvg += efflAmnt;
let totWinterTotalInflAmnt = 0; let totWinterTotalInflAmnt = 0;
totWinterTotalInflAmnt = (flowItem.inflAmnt && flowItem.inflAmnt !== 'x' ? Number(flowItem.inflAmnt.toString().trim()) : 0) + (flowItem.sumFlow && flowItem.sumFlow !== 'x' ? Number(flowItem.sumFlow.toString().trim()) : 0) + (flowItem.returnAmnt && flowItem.returnAmnt !== 'x' ? Number(flowItem.returnAmnt.toString().trim()) : 0); totWinterTotalInflAmnt = inflAmnt + sumFlow + returnAmnt;
if(winterChungchunTotalInflAmntMax < totWinterTotalInflAmnt) { if (winterChungchunTotalInflAmntMax < totWinterTotalInflAmnt) winterChungchunTotalInflAmntMax = totWinterTotalInflAmnt;
winterChungchunTotalInflAmntMax = totWinterTotalInflAmnt; if (winterChungchunTotalInflAmntMin > totWinterTotalInflAmnt || winterChungchunTotalInflAmntMin === 0) winterChungchunTotalInflAmntMin = totWinterTotalInflAmnt;
if (winterChungchunDayFlowMin > inflAmnt) winterChungchunDayFlowMin = inflAmnt;
if (winterChungchunDayFlowMax < inflAmnt) winterChungchunDayFlowMax = inflAmnt;
if (minWinterChungchunSumFlow > sumFlow) minWinterChungchunSumFlow = sumFlow;
if (maxWinterChungchunSumFlow < sumFlow) maxWinterChungchunSumFlow = sumFlow;
if (winterChungchunDayReturnMin > returnAmnt) winterChungchunDayReturnMin = returnAmnt;
if (winterChungchunDayReturnMax < returnAmnt) winterChungchunDayReturnMax = returnAmnt;
if (winterChungchunDayEfflMin > efflAmnt) winterChungchunDayEfflMin = efflAmnt;
if (winterChungchunDayEfflMax < efflAmnt) winterChungchunDayEfflMax = efflAmnt;
} }
if(winterChungchunTotalInflAmntMin > totWinterTotalInflAmnt || winterChungchunTotalInflAmntMin === 0) {
winterChungchunTotalInflAmntMin = totWinterTotalInflAmnt;
} }
if(winterChungchunDayFlowMin > (flowItem.inflAmnt && flowItem.inflAmnt !== 'x' ? Number(flowItem.inflAmnt.toString().trim()) : 0)) {
winterChungchunDayFlowMin = flowItem.inflAmnt && flowItem.inflAmnt !== 'x' ? Number(flowItem.inflAmnt.toString().trim()) : 0; yearSumFlow += sumFlow;
} if (maxYearSumFlow < sumFlow) maxYearSumFlow = sumFlow;
if(winterChungchunDayFlowMax < (flowItem.inflAmnt && flowItem.inflAmnt !== 'x' ? Number(flowItem.inflAmnt.toString().trim()) : 0)) { if (minYearSumFlow > sumFlow) minYearSumFlow = sumFlow;
winterChungchunDayFlowMax = flowItem.inflAmnt && flowItem.inflAmnt !== 'x' ? Number(flowItem.inflAmnt.toString().trim()) : 0;
// 1년 최대 총 하수유입량
let totYearFlow = 0;
totYearFlow = inflAmnt + sumFlow + returnAmnt;
if (totFlowMax < totYearFlow) totFlowMax = totYearFlow;
if (totFlowMin > totYearFlow || totFlowMin === 0) {
totFlowMin = totYearFlow;
} }
if(minWinterChungchunSumFlow > (flowItem.sumFlow && flowItem.sumFlow !== 'x' ? Number(flowItem.sumFlow.toString().trim()) : 0) ) { if (month === '06' || month === '07' || month === '08') {
minWinterChungchunSumFlow = flowItem.sumFlow && flowItem.sumFlow !== 'x' ? Number(flowItem.sumFlow.toString().trim()) : 0; summerDay += 1;
} summerSumFlow += sumFlow;
if(maxWinterChungchunSumFlow < (flowItem.sumFlow && flowItem.sumFlow !== 'x' ? Number(flowItem.sumFlow.toString().trim()) : 0)) { } else if (month === '01' || month === '02') {
maxWinterChungchunSumFlow = flowItem.sumFlow && flowItem.sumFlow !== 'x' ? Number(flowItem.sumFlow.toString().trim()) : 0; winterDay += 1;
} winterSumFlow += sumFlow;
if(winterChungchunDayReturnMin > (flowItem.returnAmnt && flowItem.returnAmnt !== 'x' ? Number(flowItem.returnAmnt.toString().trim()) : 0)) {
winterChungchunDayReturnMin = flowItem.returnAmnt && flowItem.returnAmnt !== 'x' ? Number(flowItem.returnAmnt.toString().trim()) : 0;
}
if(winterChungchunDayReturnMax < (flowItem.returnAmnt && flowItem.returnAmnt !== 'x' ? Number(flowItem.returnAmnt.toString().trim()) : 0)) {
winterChungchunDayReturnMax = flowItem.returnAmnt && flowItem.returnAmnt !== 'x' ? Number(flowItem.returnAmnt.toString().trim()) : 0;
}
if(winterChungchunDayEfflMin > (flowItem.efflAmnt && flowItem.efflAmnt !== 'x' ? Number(flowItem.efflAmnt.toString().trim()) : 0)) {
winterChungchunDayEfflMin = flowItem.efflAmnt && flowItem.efflAmnt !== 'x' ? Number(flowItem.efflAmnt.toString().trim()) : 0;
}
if(winterChungchunDayEfflMax < (flowItem.efflAmnt && flowItem.efflAmnt !== 'x' ? Number(flowItem.efflAmnt.toString().trim()) : 0)) {
winterChungchunDayEfflMax = flowItem.efflAmnt && flowItem.efflAmnt !== 'x' ? Number(flowItem.efflAmnt.toString().trim()) : 0;
}
} }
}); });
// 하절기 강우시 계산
calRainData.forEach((flowItem: any) => {
if(flowItem.msrDt.substring(4,6) === '06' || flowItem.msrDt.substring(4,6) === '07' || flowItem.msrDt.substring(4,6) === '08') {
summerRainDay += 1;
summerRainDaySumFlow += flowItem.sumFlow && flowItem.sumFlow !== 'x' ? Number(flowItem.sumFlow.toString().trim()) : 0;
summerRainDayFlow += flowItem.inflAmnt && flowItem.inflAmnt !== 'x' ? Number(flowItem.inflAmnt.toString().trim()) : 0;
summerRainDayReturnFlow += flowItem.returnAmnt && flowItem.returnAmnt !== 'x' ? Number(flowItem.returnAmnt.toString().trim()) : 0;
summerRainDayEfflFlow += flowItem.efflAmnt && flowItem.efflAmnt !== 'x' ? Number(flowItem.efflAmnt.toString().trim()) : 0;
}
});
// 연계처리수 // 연계처리수
yearAvgSumFlow = Number((yearSumFlow && Number(yearSumFlow) != 0) ? (yearSumFlow / yearDay) : ''); yearAvgSumFlow = Number((yearSumFlow && Number(yearSumFlow) != 0) ? (yearSumFlow / yearDay) : '');
@@ -1701,7 +1654,7 @@ export const dashBoardReducer:(set:(fn: (state: DashBoardType) => DashBoardType)
operationalStatusList[0].winterSunnyAvg = roundUp(Number(operationalStatusList[0].winterSunnyAvg), 0) + roundUp(winterSunnyAvg, 0); operationalStatusList[0].winterSunnyAvg = roundUp(Number(operationalStatusList[0].winterSunnyAvg), 0) + roundUp(winterSunnyAvg, 0);
// 지하수유입량 // 지하수유입량
const usage = chungcunSumFlow / calData.length; const usage = chungcunSumFlow / cntSunnyDay; //calData.length;
const summerUsage = sumSummerChungcunFlow / summerChungchunDay; const summerUsage = sumSummerChungcunFlow / summerChungchunDay;
const winterUsage = sumWinterChungcunFlow / winterChungchuDay; const winterUsage = sumWinterChungcunFlow / winterChungchuDay;
@@ -1714,10 +1667,6 @@ export const dashBoardReducer:(set:(fn: (state: DashBoardType) => DashBoardType)
operationalStatusList[0].groundWaterSummer = Math.round((summerUsage - (summerUsage * 0.65 * OSU_PERCENT)) * 100) / 100; operationalStatusList[0].groundWaterSummer = Math.round((summerUsage - (summerUsage * 0.65 * OSU_PERCENT)) * 100) / 100;
operationalStatusList[0].groundWaterWinter = Math.round((winterUsage - (winterUsage * 0.65 * OSU_PERCENT)) * 100) / 100; operationalStatusList[0].groundWaterWinter = Math.round((winterUsage - (winterUsage * 0.65 * OSU_PERCENT)) * 100) / 100;
//operationalStatusList[0].groundWaterAvg = calData.length === 0 ? '' : Number(calData[0].inflAmnt) - (Number(calData[0].inflAmnt)*0.65*0.8);
//operationalStatusList[0].groundWaterSummer = calData.length === 0 ? '' : Number(calData[0].inflAmnt) - (Number(calData[0].inflAmnt)*0.65*0.8);
//operationalStatusList[0].groundWaterWinter = calData.length === 0 ? '' : Number(calData[0].inflAmnt) - (Number(calData[0].inflAmnt)*0.65*0.8);
// 오염물질 // 오염물질
// RDII 추정 = 하절기(6~8월) 중 최저 유입 BOD일때 유입유량 x ((동절기 청천시 유입BOD - 하절기(6~8월) 중 최저 유입BOD) / (동절기 청천시 유입BOD)) // RDII 추정 = 하절기(6~8월) 중 최저 유입 BOD일때 유입유량 x ((동절기 청천시 유입BOD - 하절기(6~8월) 중 최저 유입BOD) / (동절기 청천시 유입BOD))
const resp = await fetchMainGraph(searchYear, fcltyCd); const resp = await fetchMainGraph(searchYear, fcltyCd);
@@ -1882,7 +1831,7 @@ export const dashBoardReducer:(set:(fn: (state: DashBoardType) => DashBoardType)
} }
} }
const rtnData = await calcWaterQltyData(operationalStatusList, searchYear, fcltyCd); const rtnData = await calcWaterQltyData(operationalStatusList, searchYear, fcltyCd); // 수질 데이터 청천시, 강우시 재계산
// 총인설비가 없을 경우 제외 // 총인설비가 없을 경우 제외
console.log('총인시설 여부 : ', data.yearData?.TP_FCT_YN); console.log('총인시설 여부 : ', data.yearData?.TP_FCT_YN);
+1 -1
View File
@@ -11,7 +11,7 @@ NEXT_PUBLIC_REFRESH_TOKEN = refresh-token
NEXT_PUBLIC_SERVER_API_URL = http://apigateway.iipbs-was.svc.cluster.local:8000 NEXT_PUBLIC_SERVER_API_URL = http://apigateway.iipbs-was.svc.cluster.local:8000
NEXT_PUBLIC_GEOSERVER_URL = http://172.29.143.87:8080/geoserver NEXT_PUBLIC_GEOSERVER_URL = http://172.29.143.87:8080/geoserver
NEXT_PUBLIC_LX_GEOSERVER_URL = http://172.29.143.87:8080/geoserver_swl NEXT_PUBLIC_LX_GEOSERVER_URL = http://172.29.143.87:8080/geoserver_swl
NEXT_PUBLIC_NGII_URL = http://172.29.143.87 NEXT_PUBLIC_NGII_URL = http://172.29.143.87/poiact
NEXT_PUBLIC_NGII_PARAM = BDE2BEF39DAFEC293AB6730150F222AC&service=WMTS&request=GetTile&version=1.0.0&format=image/png&layer=korean_map&style=korean&tilematrixset=korean&tilematrix={z}&tilecol={y}&tilerow={x} NEXT_PUBLIC_NGII_PARAM = BDE2BEF39DAFEC293AB6730150F222AC&service=WMTS&request=GetTile&version=1.0.0&format=image/png&layer=korean_map&style=korean&tilematrixset=korean&tilematrix={z}&tilecol={y}&tilerow={x}
NEXT_PUBLIC_SEWERAGE_API_URL = http://apigateway.iipbs-was.svc.cluster.local:8000 NEXT_PUBLIC_SEWERAGE_API_URL = http://apigateway.iipbs-was.svc.cluster.local:8000
NEXT_PUBLIC_DC_URL = http://apigateway.iipbs-was.svc.cluster.local:8000 NEXT_PUBLIC_DC_URL = http://apigateway.iipbs-was.svc.cluster.local:8000
+1 -1
View File
@@ -15,7 +15,7 @@ NEXT_PUBLIC_GEOSERVER_URL = http://172.29.143.87:8080/geoserver
NEXT_PUBLIC_LX_GEOSERVER_URL = http://172.29.143.87:8080/geoserver_swl NEXT_PUBLIC_LX_GEOSERVER_URL = http://172.29.143.87:8080/geoserver_swl
NEXT_PUBLIC_WR_SERVER_API_URL = http://apigateway.iipbs-was.svc.cluster.local:8000/reuse-service/api/v1 NEXT_PUBLIC_WR_SERVER_API_URL = http://apigateway.iipbs-was.svc.cluster.local:8000/reuse-service/api/v1
NEXT_PUBLIC_SEWERAGE_API_URL = http://apigateway.iipbs-was.svc.cluster.local:8000/sewerage-service NEXT_PUBLIC_SEWERAGE_API_URL = http://apigateway.iipbs-was.svc.cluster.local:8000/sewerage-service
NEXT_PUBLIC_NGII_URL = http://172.29.143.87 NEXT_PUBLIC_NGII_URL = http://172.29.143.87/poiact
NEXT_PUBLIC_NGII_PARAM = BDE2BEF39DAFEC293AB6730150F222AC&service=WMTS&request=GetTile&version=1.0.0&format=image/png&layer=korean_map&style=korean&tilematrixset=korean&tilematrix={z}&tilecol={y}&tilerow={x} NEXT_PUBLIC_NGII_PARAM = BDE2BEF39DAFEC293AB6730150F222AC&service=WMTS&request=GetTile&version=1.0.0&format=image/png&layer=korean_map&style=korean&tilematrixset=korean&tilematrix={z}&tilecol={y}&tilerow={x}
NEXT_PUBLIC_HASUDOINFO = https://www.hasudoinfo.or.kr NEXT_PUBLIC_HASUDOINFO = https://www.hasudoinfo.or.kr
NEXT_PUBLIC_HASUDOINFO_IN = http://10.101.163.102:8889 NEXT_PUBLIC_HASUDOINFO_IN = http://10.101.163.102:8889
@@ -43,6 +43,7 @@ type UiHeadProps = {
row?: number; row?: number;
widthPercent?: number; widthPercent?: number;
rowSpan?: number; rowSpan?: number;
colSpan?: number;
}; };
export function UiTable({ export function UiTable({
@@ -261,7 +262,8 @@ export function UiTable({
<TableRow> <TableRow>
<TableCell <TableCell
colSpan={ colSpan={
headlist.filter((item) => item.visible != false).length headlist.filter((item) => item.visible != false).length -
headlist.filter((item) => item.visible != false && item.colSpan).length
} }
className="h-24 text-center text-gray-500" className="h-24 text-center text-gray-500"
> >