TnDailyUserLog 수정

egovframe-template-simple-react-contribution/src/pages/admin/schedule/EgovAdminScheduleList.jsx

@@ -294,7 +294,7 @@ function EgovAdminDashboard(props) {
                                     <Box sx={{ p: 3, pb: 0 }}>
                                         <Stack spacing={2}>
                                             <Typography variant="h3" color="textSecondary">
-                                                주간 현황
+                                                이번주 현황
                                             </Typography>
                                             <Typography variant="h6">총 {totalDownloads}건</Typography>
                                         </Stack>

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) {
+    public String modifyCodeItem(TcCodeItem codeItem) {
-    TcCodeItem savedItem = codeItemRepository.findById(
+      TcCodeItem savedItem = codeItemRepository.findById(
-        new TcCodeItem.TcCodeItemId(codeItem.getItemCd(), codeItem.getGrpCd())
+              new TcCodeItem.TcCodeItemId(codeItem.getItemCd(), codeItem.getGrpCd())
-    ).orElse(null);
+      ).orElse(null);
-    if (savedItem != null) {
+      if (savedItem != null) {
-      savedItem.setItemNm(codeItem.getItemNm());
+        savedItem.setItemNm(codeItem.getItemNm());
-      savedItem.setLastChgId(codeItem.getLastChgId());
+        savedItem.setLastChgId(codeItem.getLastChgId());
-      savedItem.setLastChgDt(codeItem.getLastChgDt());
+        savedItem.setLastChgDt(codeItem.getLastChgDt());
-      savedItem.setGrpOrder(codeItem.getGrpOrder());
+        savedItem.setGrpOrder(codeItem.getGrpOrder());
-      savedItem.setUseYn(codeItem.getUseYn());
+        savedItem.setUseYn(codeItem.getUseYn());
-      codeItemRepository.save(savedItem);
+        codeItemRepository.save(savedItem);
-      return "modified";
+        return "modified";
-    }else{
+      }else{
-      return "validGrpCd";
+        return "validGrpCd";
+      }
     }
-  }
 
-  public List<TcMenu> selectMenuList() {
+    public List<TcMenu> selectMenuList() {
-    return menuMapper.selectMenuList();
+      return menuMapper.selectMenuList();
   }
 
   @Transactional
@@ -165,4 +165,4 @@ public class AdminConfigService extends EgovAbstractServiceImpl {
     }
     menuRoleRepository.saveAll(roleList);
   }
-}
+}

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/dashboard/dto/MonthlyUserLogDTO.java

@@ -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];
-    }
-}

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/dashboard/entity/TnDailyUserLog.java

@@ -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;
-
-
-}

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/dashboard/repository/TnDailyUserLogRepository.java

@@ -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<TnDailyUserLog, Long> {
-    List<TnDailyUserLog> 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<Object[]> selectMonthlyUserLogStatistics(@Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
-
-}

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;
 }

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<TnDailyUserConnLog, Long> {
+public interface UserLogsRepository extends JpaRepository<TnDailyUserLog, Long> {
 
     @Query(value = "SELECT COUNT(DISTINCT log_dt) "
             + "FROM tn_daily_user_log "