diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/schedule/EgovAdminScheduleList.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/schedule/EgovAdminScheduleList.jsx index 0044ef0..643ae36 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/schedule/EgovAdminScheduleList.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/schedule/EgovAdminScheduleList.jsx @@ -294,7 +294,7 @@ function EgovAdminDashboard(props) { - 주간 현황 + 이번주 현황 총 {totalDownloads}건 diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/service/AdminConfigService.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/service/AdminConfigService.java index 0c5fd44..78e46d3 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/service/AdminConfigService.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/service/AdminConfigService.java @@ -89,25 +89,25 @@ public class AdminConfigService extends EgovAbstractServiceImpl { } @Transactional - public String modifyCodeItem(TcCodeItem codeItem) { - TcCodeItem savedItem = codeItemRepository.findById( - new TcCodeItem.TcCodeItemId(codeItem.getItemCd(), codeItem.getGrpCd()) - ).orElse(null); - if (savedItem != null) { - savedItem.setItemNm(codeItem.getItemNm()); - savedItem.setLastChgId(codeItem.getLastChgId()); - savedItem.setLastChgDt(codeItem.getLastChgDt()); - savedItem.setGrpOrder(codeItem.getGrpOrder()); - savedItem.setUseYn(codeItem.getUseYn()); - codeItemRepository.save(savedItem); - return "modified"; - }else{ - return "validGrpCd"; + public String modifyCodeItem(TcCodeItem codeItem) { + TcCodeItem savedItem = codeItemRepository.findById( + new TcCodeItem.TcCodeItemId(codeItem.getItemCd(), codeItem.getGrpCd()) + ).orElse(null); + if (savedItem != null) { + savedItem.setItemNm(codeItem.getItemNm()); + savedItem.setLastChgId(codeItem.getLastChgId()); + savedItem.setLastChgDt(codeItem.getLastChgDt()); + savedItem.setGrpOrder(codeItem.getGrpOrder()); + savedItem.setUseYn(codeItem.getUseYn()); + codeItemRepository.save(savedItem); + return "modified"; + }else{ + return "validGrpCd"; + } } - } - public List selectMenuList() { - return menuMapper.selectMenuList(); + public List selectMenuList() { + return menuMapper.selectMenuList(); } @Transactional @@ -165,4 +165,4 @@ public class AdminConfigService extends EgovAbstractServiceImpl { } menuRoleRepository.saveAll(roleList); } -} +} \ No newline at end of file diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/dashboard/dto/MonthlyUserLogDTO.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/dashboard/dto/MonthlyUserLogDTO.java deleted file mode 100644 index 430ee35..0000000 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/dashboard/dto/MonthlyUserLogDTO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.dbnt.kcscbackend.admin.dashboard.dto; - -import com.dbnt.kcscbackend.admin.dashboard.entity.TnDailyUserLog; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.ToString; - -import java.math.BigInteger; -import java.time.LocalDate; - -@Data -@AllArgsConstructor -@ToString -public class MonthlyUserLogDTO { - private String logDt; - private BigInteger logCnt; - - public MonthlyUserLogDTO(Object[] row) { - this.logDt = (String) row[0]; - this.logCnt = (BigInteger) row[1]; - } -} diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/dashboard/entity/TnDailyUserLog.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/dashboard/entity/TnDailyUserLog.java deleted file mode 100644 index 30cd0ad..0000000 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/dashboard/entity/TnDailyUserLog.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.dbnt.kcscbackend.admin.dashboard.entity; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.*; -import java.math.BigInteger; -import java.time.LocalDate; - -@Getter -@Setter -@Entity -@NoArgsConstructor -@DynamicInsert -@DynamicUpdate -@Table(name = "tn_daily_user_log") -public class TnDailyUserLog { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "dul_seq") - private Long dulSeq; - - @Column(name = "log_dt") - private LocalDate logDt; - - @Column(name = "log_cnt") - private Integer logCnt; - - @Column(name = "mobile_cnt") - private Integer mobileCnt; - - @Column(name = "pc_cnt") - private Integer pcCnt; - - -} \ No newline at end of file diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/dashboard/repository/TnDailyUserLogRepository.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/dashboard/repository/TnDailyUserLogRepository.java deleted file mode 100644 index 4074153..0000000 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/dashboard/repository/TnDailyUserLogRepository.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.dbnt.kcscbackend.admin.dashboard.repository; - -import com.dbnt.kcscbackend.admin.dashboard.entity.TnDailyUserLog; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import java.time.LocalDate; -import java.util.List; - -public interface TnDailyUserLogRepository extends JpaRepository { - List findByLogDtBetweenOrderByLogDt(LocalDate startDate, LocalDate endDate); - - @Query(value = "SELECT TO_CHAR(log_dt, 'YYYYMM') as log_dt, " - + "SUM(log_cnt) as log_cnt " - + "FROM tn_daily_user_log " - + "WHERE log_dt BETWEEN :startDate AND :endDate " - + "GROUP BY TO_CHAR(log_dt, 'YYYYMM') " - + "ORDER BY log_dt", nativeQuery = true) - List selectMonthlyUserLogStatistics(@Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate); - -} 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/TnDailyUserLog.java similarity index 82% rename from kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/entity/TnDailyUserConnLog.java rename to kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/entity/TnDailyUserLog.java index 9ae62a7..05845f1 100644 --- 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/TnDailyUserLog.java @@ -10,7 +10,6 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.*; import java.time.LocalDate; -import java.awt.*; @Getter @Setter @@ -20,7 +19,7 @@ import java.awt.*; @DynamicInsert @DynamicUpdate @Table(name = "tn_daily_user_log") -public class TnDailyUserConnLog { +public class TnDailyUserLog { @Id @Column(name = "dul_seq") private Long dulSeq; @@ -31,4 +30,10 @@ public class TnDailyUserConnLog { @Column(name = "log_dt") @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate logDt; + + @Column(name = "mobile_cnt") + private Integer mobileCnt; + + @Column(name = "pc_cnt") + private Integer pcCnt; } 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 index 8c8d67e..3743c64 100644 --- 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 @@ -1,13 +1,13 @@ package com.dbnt.kcscbackend.admin.logs.repository; -import com.dbnt.kcscbackend.admin.logs.entity.TnDailyUserConnLog; +import com.dbnt.kcscbackend.admin.logs.entity.TnDailyUserLog; 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 { +public interface UserLogsRepository extends JpaRepository { @Query(value = "SELECT COUNT(DISTINCT log_dt) " + "FROM tn_daily_user_log "