diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/logs/UserConnections.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/logs/UserConnections.jsx index cad6625..44ac15f 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/logs/UserConnections.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/logs/UserConnections.jsx @@ -1,11 +1,228 @@ -import React from 'react'; +import React, {useState, useEffect, useCallback, useRef, PureComponent} from 'react'; +import { Link, useLocation } from 'react-router-dom'; +import {BarChart, Bar, Rectangle, XAxis, YAxis, CartesianGrid, Tooltip, Legend, ResponsiveContainer} from 'recharts'; +import DatePicker from 'react-datepicker'; +import 'react-datepicker/dist/react-datepicker.css'; + +import {format, sub} from "date-fns"; +import { ko } from 'date-fns/locale'; + +import * as EgovNet from 'api/egovFetch'; +import URL from 'constants/url'; + +import { default as EgovLeftNav } from 'components/leftmenu/EgovLeftNavAdmin'; + +import { itemIdxByPage } from 'utils/calc'; function UserConnections(props) { + // console.group("EgovAdminPrivacyList"); + // console.log("[Start] EgovAdminPrivacyList ------------------------------"); + // console.log("EgovAdminPrivacyList [props] : ", props); + const nowDate = new Date(); + const oneMonthAgoDate = sub(nowDate, { months: 1 }); + const [start_date, setStartDate] = useState(oneMonthAgoDate); + const [end_date, setEndDate] = useState(nowDate); // new Date() + + const location = useLocation(); + // console.log("EgovAdminPrivacyList [location] : ", location); + + // eslint-disable-next-line no-unused-vars + const [searchCondition, setSearchCondition] = useState(location.state?.searchCondition || {start_date: format(start_date, "yyyy-MM-dd"), end_date: format(end_date, "yyyy-MM-dd")}); + const [chartData, setChartData] = useState([]); + + const [listTag, setListTag] = useState([]); + + const retrieveList = useCallback((srchCnd) => { + // console.groupCollapsed("EgovAdminUsageList.retrieveList()"); + const retrieveListURL = '/admin/logs/user'; + + const requestOptions = { + method: "POST", + headers: { + 'Content-type': 'application/json', + }, + body: JSON.stringify(srchCnd) + } + + EgovNet.requestFetch( + retrieveListURL, + requestOptions, + (resp) => { + let mutListTag = []; + + const resultCnt = parseInt(resp.result.resultCnt); + const currentPageNo = 1; // resp.result.paginationInfo.currentPageNo; + const pageSize = resultCnt; // resp.result.paginationInfo.pageSize; + + // 리스트 항목 구성 + if (resultCnt === 0) { + mutListTag.push(

데이터가 없습니다.

); + } else { + resp.result.resultList.forEach(function (item, index) { + // if (index === 0) mutListTag = []; // 목록 초기화 + const listIdx = itemIdxByPage(resultCnt, currentPageNo, pageSize, index); + + mutListTag.push( +
+
{item[0]}
+
{item[1].toLocaleString()}
+
+ ); + }); + } + setListTag(mutListTag); + + let chartDataArray = resp.result.resultList.map((item, index) => ({ + logCnt: item[0], // Assuming logCnt is the x-axis data + "접속수": item[1], // Assuming menuTitle is the y-axis data + })); + setChartData(chartDataArray); + }, + function (resp) { + console.log("err response : ", resp); + } + ); + // console.groupEnd("EgovAdminPrivacyList.retrieveList()"); + },[listTag]); + + const CustomTooltip = ({ active, payload, label }) => { + if (active && payload && payload.length) { + return ( +
+

사용자 접속현황

+

{`${label} : ${payload[0].value}`}

+ {/*

Anything you want can be displayed here.

*/} +
+ ); + } + return null; + }; + + useEffect(() => { + retrieveList(searchCondition); + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [start_date, end_date]); + + // console.log("------------------------------EgovAdminPrivacyList [End]"); + // console.groupEnd("EgovAdminPrivacyList"); + return (
- UserConnections +
+ {/* */} +
+
    +
  • Home
    • +
  • 사이트관리
    • +
  • 로그현황
    • +
  • 사용자 접속현황
    • +
+
+ {/* */} + +
+ {/* */} + + {/* */} + +
+ {/* */} + +
+

사용자 접속현황

+
+ + {/* */} +
+
    +
  • + { + setStartDate(date); + setSearchCondition({ + start_date: format(date, "yyyy-MM-dd"), + end_date: format(end_date, "yyyy-MM-dd") + }); + }} + /> - +
    • +
  • + { + setEndDate(date); + setSearchCondition({ + start_date: format(start_date, "yyyy-MM-dd"), + end_date: format(date, "yyyy-MM-dd") + }); + }} + /> +
    • +
+
+ {/* */} + + {/* */} +
+
+
+
+ 접속일자 + 접속횟수 +
+
+ {listTag} +
+
+
+
+ + + + + + } /> + + } /> + + +
+
+ {/* */} + + {/* */} +
+
+
); } diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/AdminLogsController.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/AdminLogsController.java index 398de83..44b6f23 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/AdminLogsController.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/AdminLogsController.java @@ -4,6 +4,7 @@ import com.dbnt.kcscbackend.admin.logs.entity.TnDailyMenuLog; import com.dbnt.kcscbackend.admin.logs.entity.ThPrivacyLog; import com.dbnt.kcscbackend.admin.logs.service.AdminMenuService; import com.dbnt.kcscbackend.admin.logs.service.AdminLogsService; +import com.dbnt.kcscbackend.admin.logs.service.AdminUserService; import com.dbnt.kcscbackend.auth.entity.LoginVO; import com.dbnt.kcscbackend.config.common.BaseController; import com.dbnt.kcscbackend.config.common.ResponseCode; @@ -32,6 +33,7 @@ import java.util.Map; public class AdminLogsController extends BaseController { private final AdminMenuService adminMenuService; + private final AdminUserService adminUserService; private final AdminLogsService adminLogsService; @Operation( @@ -63,6 +65,34 @@ public class AdminLogsController extends BaseController { } + @Operation( + summary = "로그현황 - 사용자 접속현황", + description = "사용자 접속현황", + tags = {"AdminLogsController"} + ) + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "조회 성공"), + @ApiResponse(responseCode = "403", description = "인가된 사용자가 아님") + }) + @RequestMapping(method = RequestMethod.POST, value = "/user", consumes = MediaType.APPLICATION_JSON_VALUE) + public ResultVO UserListCount(@RequestBody Map dateRange, + @AuthenticationPrincipal LoginVO user) + throws Exception { + + ResultVO resultVO = new ResultVO(); + Map resultMap = new HashMap<>(); + + String startDate = dateRange.get("start_date"); + String endDate = dateRange.get("end_date"); + + resultMap.put("resultCnt", adminUserService.selectUserCountCnt(startDate, endDate)); + resultMap.put("resultList", adminUserService.selectUserCount(startDate, endDate)); + resultVO.setResultCode(ResponseCode.SUCCESS.getCode()); + resultVO.setResultMessage(ResponseCode.SUCCESS.getMessage()); + resultVO.setResult(resultMap); + return resultVO; + } + @Operation( summary = "로그현황 - 개인정보 로그", description = "개인정보 로그현황", diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/entity/TnDailyUserConnLog.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/entity/TnDailyUserConnLog.java new file mode 100644 index 0000000..9ae62a7 --- /dev/null +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/entity/TnDailyUserConnLog.java @@ -0,0 +1,34 @@ +package com.dbnt.kcscbackend.admin.logs.entity; + +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.experimental.Accessors; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.persistence.*; +import java.time.LocalDate; +import java.awt.*; + +@Getter +@Setter +@Accessors(chain = true) +@Entity +@NoArgsConstructor +@DynamicInsert +@DynamicUpdate +@Table(name = "tn_daily_user_log") +public class TnDailyUserConnLog { + @Id + @Column(name = "dul_seq") + private Long dulSeq; + + @Column(name = "log_cnt") + private Long logCnt; + + @Column(name = "log_dt") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate logDt; +} diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/repository/UserLogsRepository.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/repository/UserLogsRepository.java new file mode 100644 index 0000000..8c8d67e --- /dev/null +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/repository/UserLogsRepository.java @@ -0,0 +1,25 @@ +package com.dbnt.kcscbackend.admin.logs.repository; + +import com.dbnt.kcscbackend.admin.logs.entity.TnDailyUserConnLog; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; + +public interface UserLogsRepository extends JpaRepository { + + @Query(value = "SELECT COUNT(DISTINCT log_dt) " + + "FROM tn_daily_user_log " + + "WHERE log_dt BETWEEN TO_DATE(:startDate, 'YYYY-MM-DD') AND TO_DATE(:endDate, 'YYYY-MM-DD')", nativeQuery = true) + long countDistinctUserIds(@Param("startDate") String startDate, @Param("endDate") String endDate); + + @Query(value = "SELECT TO_CHAR(log_dt, 'YYYY-MM-DD') as log_dt, sum(log_cnt) as log_cnt " + + "FROM tn_daily_user_log " + + "WHERE log_dt BETWEEN TO_DATE(:startDate, 'YYYY-MM-DD') AND TO_DATE(:endDate, 'YYYY-MM-DD') " + + "GROUP BY TO_CHAR(log_dt, 'YYYY-MM-DD') " + + "ORDER BY log_dt asc", nativeQuery = true) + List selectCountUser(@Param("startDate") String startDate, @Param("endDate") String endDate); + + +} diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/service/AdminUserService.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/service/AdminUserService.java new file mode 100644 index 0000000..93980ed --- /dev/null +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/service/AdminUserService.java @@ -0,0 +1,25 @@ +package com.dbnt.kcscbackend.admin.logs.service; + +import com.dbnt.kcscbackend.admin.logs.repository.UserLogsRepository; +import lombok.RequiredArgsConstructor; +import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class AdminUserService extends EgovAbstractServiceImpl { + private final UserLogsRepository userLogsRepository; + + // 메뉴별 접속횟수 + public List selectUserCount(String startDate, String endDate) { + return userLogsRepository.selectCountUser(startDate, endDate); + } + + // 전체 레코드 수 가져오기 + public long selectUserCountCnt(String startDate, String endDate) { + return userLogsRepository.countDistinctUserIds(startDate, endDate); + } + +}