From 7c8937d0fb940e10a1a1e336a5695ce4be47c771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Mon, 23 Jun 2025 17:28:48 +0900 Subject: [PATCH 01/59] =?UTF-8?q?aws,=20api=20=EB=AA=A8=EB=93=88=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3365d4a0..579bbf68 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,10 +9,8 @@ WORKDIR /app # 소스 디렉토리를 컨테이너에 복사 COPY pom.xml . COPY core ./core -COPY aws ./aws COPY admin ./admin COPY front ./front -COPY api ./api # Maven을 이용해 프로젝트 빌드 RUN mvn --projects $TARGET_MODULE --also-make package -Dmaven.test.skip=true From bc71fac78b14dba40fa11f26152608d6d8a1f03a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Mon, 23 Jun 2025 17:28:48 +0900 Subject: [PATCH 02/59] =?UTF-8?q?aws,=20api=20=EB=AA=A8=EB=93=88=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3365d4a0..579bbf68 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,10 +9,8 @@ WORKDIR /app # 소스 디렉토리를 컨테이너에 복사 COPY pom.xml . COPY core ./core -COPY aws ./aws COPY admin ./admin COPY front ./front -COPY api ./api # Maven을 이용해 프로젝트 빌드 RUN mvn --projects $TARGET_MODULE --also-make package -Dmaven.test.skip=true From a885f860adc50a8b2a14e749fd302a7390add8cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Mon, 21 Jul 2025 10:21:15 +0900 Subject: [PATCH 03/59] =?UTF-8?q?[TEST]=20=EB=B0=B0=EC=B9=98=20=EC=A4=91?= =?UTF-8?q?=EB=B3=B5=20=EC=8B=A4=ED=96=89=20=EB=B0=A9=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/module/admin/AdminApplication.java | 2 - .../application/bean/SchedulingConfig.java | 21 +++++++ .../adapters/persistence/BatchLogDao.java | 5 ++ .../adapters/persistence/BatchLogMapper.java | 1 + .../batchLog/ports/BatchLogPortIn.java | 1 + .../batchLog/ports/BatchLogPortOut.java | 1 + .../ports/application/BatchLogService.java | 5 ++ .../adapters/web/AutoSchedulesController.java | 61 +++++++++++++++++-- .../mappers/batchLog/BatchLogMapper.xml | 10 +++ .../resources/sql/data/04_second_open.sql | 2 + 10 files changed, 101 insertions(+), 8 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/config/application/bean/SchedulingConfig.java diff --git a/admin/src/main/java/app/module/admin/AdminApplication.java b/admin/src/main/java/app/module/admin/AdminApplication.java index d50f82f3..f13eb49f 100644 --- a/admin/src/main/java/app/module/admin/AdminApplication.java +++ b/admin/src/main/java/app/module/admin/AdminApplication.java @@ -6,11 +6,9 @@ import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.ComponentScan; -import org.springframework.scheduling.annotation.EnableScheduling; @SpringBootApplication @EnableCaching -@EnableScheduling @ComponentScan(basePackages = "app.module") public class AdminApplication extends SpringBootServletInitializer { diff --git a/admin/src/main/java/app/module/admin/config/application/bean/SchedulingConfig.java b/admin/src/main/java/app/module/admin/config/application/bean/SchedulingConfig.java new file mode 100644 index 00000000..d57ea0cf --- /dev/null +++ b/admin/src/main/java/app/module/admin/config/application/bean/SchedulingConfig.java @@ -0,0 +1,21 @@ +package app.module.admin.config.application.bean; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; + +@Configuration +@EnableScheduling +public class SchedulingConfig { + + @Bean + public ThreadPoolTaskScheduler taskScheduler() { + ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler(); + scheduler.setPoolSize(5); + scheduler.setThreadNamePrefix("scheduled-task-"); + scheduler.setWaitForTasksToCompleteOnShutdown(true); + scheduler.setAwaitTerminationSeconds(60); + return scheduler; + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java b/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java index 6615ac8a..5c9dd44d 100644 --- a/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java @@ -25,6 +25,11 @@ class BatchLogDao implements BatchLogPortOut { return cmd.getId(); } + @Override + public void createError(BatchLogType type, String hostName, String status, String errorMessage) { + mapper.createError(type.name(), hostName, status, errorMessage); + } + @Override public void update(Long id, String status, String errorMessage) { mapper.update(id, status, errorMessage); diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogMapper.java b/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogMapper.java index cf204385..08bf5530 100644 --- a/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogMapper.java @@ -7,5 +7,6 @@ import org.apache.ibatis.annotations.Mapper; public interface BatchLogMapper { boolean exists(String type); Long create(BatchLogCmd cmd); + Long createError(String type, String hostName, String status, String errorMessage); void update(Long id, String status, String errorMessage); } diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortIn.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortIn.java index 1c2d1947..037d39dd 100644 --- a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortIn.java @@ -5,5 +5,6 @@ import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; public interface BatchLogPortIn { boolean exists(BatchLogType type); Long create(BatchLogType type); + void createError(BatchLogType type, String hostName, String status, String errorMessage); void update(Long id, String status, String errorMessage); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortOut.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortOut.java index 916ff343..17410439 100644 --- a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortOut.java @@ -5,5 +5,6 @@ import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; public interface BatchLogPortOut { boolean exists(BatchLogType type); Long create(BatchLogType type); + void createError(BatchLogType type, String hostName, String status, String errorMessage); void update(Long id, String status, String errorMessage); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/BatchLogService.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/BatchLogService.java index 426060aa..5a1054e1 100644 --- a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/BatchLogService.java +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/BatchLogService.java @@ -21,6 +21,11 @@ class BatchLogService implements BatchLogPortIn { return portOut.create(type); } + @Override + public void createError(BatchLogType type, String hostName, String status, String errorMessage) { + portOut.createError(type, hostName, status, errorMessage); + } + @Override public void update(Long id, String status, String errorMessage) { portOut.update(id, status, errorMessage); diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java index 1d88c5da..7c46b1fd 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java @@ -1,5 +1,7 @@ package app.module.admin.usecase.schedule.autoSchedules.adapters.web; +import app.module.admin.usecase.batchLog.ports.BatchLogPortIn; +import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; import app.module.admin.usecase.schedule.autoSchedules.ports.AutoSchedulesPortIn; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; @@ -10,9 +12,20 @@ import org.springframework.stereotype.Component; public class AutoSchedulesController { private final AutoSchedulesPortIn portIn; + private final BatchLogPortIn batchLogPortIn; + private final java.util.Set runningTasks = java.util.concurrent.ConcurrentHashMap.newKeySet(); - public AutoSchedulesController(AutoSchedulesPortIn portIn) { + public AutoSchedulesController(AutoSchedulesPortIn portIn, BatchLogPortIn batchLogPortIn) { this.portIn = portIn; + this.batchLogPortIn = batchLogPortIn; + } + + private boolean isAlreadyRunning(String lockKey) { + return !runningTasks.add(lockKey); + } + + private void releaseLock(String lockKey) { + runningTasks.remove(lockKey); } /** @@ -20,18 +33,30 @@ public class AutoSchedulesController { * 매 월 1일 0초 마다 실행되는 스케줄러 */ //@Scheduled(cron = "0 0 0 1 * *") - @Scheduled(cron = "1 0 0 19,20 * *") + @Scheduled(cron = "0 0 * * * *") public void fetchMonthlyStatus() { + String lockKey = "fetchMonthlyStatus_" + java.time.LocalDate.now(); try { - String host = java.net.InetAddress.getLocalHost().getHostName(); + // 중복 실행 방지를 위한 간단한 체크 + if (isAlreadyRunning(lockKey)) { + log.warn("fetchMonthlyStatus가 이미 실행 중입니다. 중복 실행을 건너뜁니다."); + + batchLogPortIn.createError(BatchLogType.MONTHLY_STATUS, host, "WARNING", "fetchMonthlyStatus가 이미 실행 중입니다. 중복 실행을 건너뜁니다."); + return; + } + log.info("스케줄 실행 : fetchMonthlyStatus / {} / {} / {} / {}", host, this, + System.identityHashCode(this), Thread.currentThread().getName()); portIn.operate(); } catch (Exception e) { log.error(e.getMessage(), e); + } finally { + log.info("스케줄 종료 : fetchMonthlyStatus / {}", lockKey); + + releaseLock(lockKey); } } @@ -41,16 +66,28 @@ public class AutoSchedulesController { */ @Scheduled(cron = "0 0 17 * * ?") public void fetchSmsAutoSend() { + String lockKey = "fetchSmsAutoSend" + java.time.LocalDate.now(); try { - String host = java.net.InetAddress.getLocalHost().getHostName(); + // 중복 실행 방지를 위한 간단한 체크 + if (isAlreadyRunning(lockKey)) { + log.warn("fetchSmsAutoSend 이미 실행 중입니다. 중복 실행을 건너뜁니다."); + + batchLogPortIn.createError(BatchLogType.AUTO_SMS, host, "WARNING", "fetchSmsAutoSend 이미 실행 중입니다. 중복 실행을 건너뜁니다."); + return; + } + log.info("스케줄 실행 : fetchSmsAutoSend / {} / {} / {} / {}", host, this, + System.identityHashCode(this), Thread.currentThread().getName()); portIn.sendAutoSms(); } catch (Exception e) { log.error(e.getMessage(), e); + } finally { + log.info("스케줄 종료 : fetchSmsAutoSend / {}", lockKey); + + releaseLock(lockKey); } } @@ -59,18 +96,30 @@ public class AutoSchedulesController { * 매월 16일 0시 0초에 실행되는 스케줄러 */ // @Scheduled(cron = "0 0 0 16 * *") - @Scheduled(cron = "0 0 0 19,20 * *") + @Scheduled(cron = "0 0 * * * *") public void fetchMonthlyCarryOver() { + String lockKey = "fetchMonthlyCarryOver_" + java.time.LocalDate.now(); try { - String host = java.net.InetAddress.getLocalHost().getHostName(); + // 중복 실행 방지를 위한 간단한 체크 + if (isAlreadyRunning(lockKey)) { + log.warn("fetchMonthlyCarryOver가 이미 실행 중입니다. 중복 실행을 건너뜁니다."); + + batchLogPortIn.createError(BatchLogType.CARRYOVER, host, "WARNING", "fetchMonthlyCarryOver가 이미 실행 중입니다. 중복 실행을 건너뜁니다."); + return; + } + log.info("스케줄 실행 : fetchMonthlyCarryOver / {} / {} / {} / {}", host, this, + System.identityHashCode(this), Thread.currentThread().getName()); portIn.monthlyCarryOver(); } catch (Exception e) { log.error(e.getMessage(), e); + } finally { + log.info("스케줄 종료 : fetchMonthlyCarryOver / {}", lockKey); + + releaseLock(lockKey); } } } diff --git a/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml b/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml index cf760fd7..0749c805 100644 --- a/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml +++ b/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml @@ -23,6 +23,16 @@ VALUES (#{id}, #{type}, #{status}, #{startAt}, now()) + + + + SELECT nextval('batch_log_seq') + + + INSERT INTO batch_log (id, type, status, error_message, start_at, created_at, created_host) + VALUES (#{id}, #{type}, #{status}, #{errorMessage}, now(), now(), #{hostName}) + + UPDATE batch_log diff --git a/core/src/main/resources/sql/data/04_second_open.sql b/core/src/main/resources/sql/data/04_second_open.sql index f871d0fb..de8fc05b 100644 --- a/core/src/main/resources/sql/data/04_second_open.sql +++ b/core/src/main/resources/sql/data/04_second_open.sql @@ -401,6 +401,7 @@ CREATE TABLE batch_log ( end_at TIMESTAMP, error_message VARCHAR(2000), created_at TIMESTAMP DEFAULT now(), + created_host VARCHAR(100), CONSTRAINT batch_log_pkey PRIMARY KEY (id) ); @@ -412,6 +413,7 @@ COMMENT ON COLUMN batch_log.start_at IS '배치 시작 시간'; COMMENT ON COLUMN batch_log.end_at IS '배치 종료 시간'; COMMENT ON COLUMN batch_log.error_message IS '에러 메시지 (실패한 경우)'; COMMENT ON COLUMN batch_log.created_at IS '생성일'; +COMMENT ON COLUMN batch_log.created_host IS '생성HOST'; From e0382d19d0245d2b5791f10b3ba1bb6634d253bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Mon, 21 Jul 2025 10:23:41 +0900 Subject: [PATCH 04/59] =?UTF-8?q?=EA=B0=9C=EB=B0=9C=EC=84=9C=EB=B2=84=20mm?= =?UTF-8?q?s=20=EB=94=94=EB=B9=84=20->=20=EC=9A=B4=EC=98=81=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/main/resources/application-dev.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/src/main/resources/application-dev.yml b/admin/src/main/resources/application-dev.yml index a40f9336..d2ab5fc7 100644 --- a/admin/src/main/resources/application-dev.yml +++ b/admin/src/main/resources/application-dev.yml @@ -23,9 +23,9 @@ spring: password: ENC(uBHyXdI39UzPNvYNHDGfjmMMuhN83xoP8F3wDq/S9DxizhFwbMeEqa36oZ205CBg) mms: driver-class-name: org.postgresql.Driver - jdbc-url: jdbc:postgresql://15.165.180.203:5432/ko_research_hyunjoo - username: hyunjoo - password: hyunjoo1@#4 + jdbc-url: ENC(TZ7H8DIFZDbsNp3PRWbz3bkJbjsx3580ljmELMJInASgpiEH66Lb8adpjt5WGXoIdZbHetlgtEFo8F+U8XUa9fjYWNOpiZ+D99XoXJUOP3s=) + username: ENC(cNXntROGOeM115QfLlVhhBz8+qY70eTWwmwLM+7AMslWmfWTq9ZPl4pVnDopJauM) + password: ENC(kUIzqWTu0+bqjYH4Jq9TFOOh3UwY+XVvA2OlT4VXJvxWCas66UNdGRmWDQKri5fI) maximum-pool-size: 2 minimum-idle: 1 From bab4ef52ce11e1d68c11351621649b24128d5546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Mon, 21 Jul 2025 10:49:08 +0900 Subject: [PATCH 05/59] =?UTF-8?q?[FO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20?= =?UTF-8?q?=EC=9E=84=EC=97=85=EC=83=9D=EC=82=B0=EB=AC=BC=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../daily/forestry/ports/application/DailyForestryService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/main/java/app/module/front/usecase/daily/forestry/ports/application/DailyForestryService.java b/front/src/main/java/app/module/front/usecase/daily/forestry/ports/application/DailyForestryService.java index 80575894..b3f2c030 100644 --- a/front/src/main/java/app/module/front/usecase/daily/forestry/ports/application/DailyForestryService.java +++ b/front/src/main/java/app/module/front/usecase/daily/forestry/ports/application/DailyForestryService.java @@ -35,7 +35,7 @@ public class DailyForestryService implements DailyForestryPortIn { @Override public List list(DailyForestryUIReqVO reqVO) { - return this.getRefineList(reqVO, false); + return this.getRefineList(reqVO, true); } @Override From d88d655025fee77afb7f4e15aac89c342c068416 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Mon, 21 Jul 2025 10:57:21 +0900 Subject: [PATCH 06/59] =?UTF-8?q?=EB=B0=B0=EC=B9=98=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=20insert,=20update=20=EC=8B=9C=20hostName=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/batch/BatchLogRunner.java | 17 ++++++++++++++--- .../adapters/persistence/BatchLogDao.java | 8 ++++---- .../adapters/persistence/BatchLogMapper.java | 2 +- .../usecase/batchLog/ports/BatchLogPortIn.java | 4 ++-- .../usecase/batchLog/ports/BatchLogPortOut.java | 4 ++-- .../ports/application/BatchLogService.java | 8 ++++---- .../ports/application/domain/BatchLogCmd.java | 1 + .../mappers/batchLog/BatchLogMapper.xml | 7 ++++--- 8 files changed, 32 insertions(+), 19 deletions(-) diff --git a/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java b/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java index 71e2ceb3..66c01350 100644 --- a/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java +++ b/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java @@ -3,12 +3,15 @@ package app.module.admin.config.application.batch; import app.module.admin.usecase.batchLog.ports.BatchLogPortIn; import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; import app.module.core.config.application.logging.SafeLogger; +import java.net.UnknownHostException; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor +@Slf4j public class BatchLogRunner { SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(BatchLogRunner.class)); @@ -21,16 +24,24 @@ public class BatchLogRunner { return; } + String hostName; + try { + hostName = java.net.InetAddress.getLocalHost().getHostName(); + } catch (UnknownHostException e) { + hostName = "UNKNOWN"; + log.warn("호스트 이름 조회 실패", e); + } + // 실행 로그 insert (RUNNING) - Long logId = batchLogPortIn.create(batchType); + Long logId = batchLogPortIn.create(batchType, hostName); try { action.run(); // 성공 처리 - batchLogPortIn.update(logId, "SUCCESS", null); + batchLogPortIn.update(logId, hostName,"SUCCESS", null); } catch (Exception e) { // 실패 처리 - batchLogPortIn.update(logId, "FAIL", e.getMessage()); + batchLogPortIn.update(logId, hostName,"FAIL", e.getMessage()); safeLogger.error("[{}] 배치 실패: {}", batchType.name(), e.getMessage(), e); } } diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java b/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java index 5c9dd44d..e60fa058 100644 --- a/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java @@ -19,8 +19,8 @@ class BatchLogDao implements BatchLogPortOut { } @Override - public Long create(BatchLogType type) { - BatchLogCmd cmd = new BatchLogCmd(null, type.name(), "RUNNING", LocalDateTime.now()); + public Long create(BatchLogType type, String hostName) { + BatchLogCmd cmd = new BatchLogCmd(null, type.name(), "RUNNING", LocalDateTime.now(), hostName); mapper.create(cmd); return cmd.getId(); } @@ -31,7 +31,7 @@ class BatchLogDao implements BatchLogPortOut { } @Override - public void update(Long id, String status, String errorMessage) { - mapper.update(id, status, errorMessage); + public void update(Long id, String hostName, String status, String errorMessage) { + mapper.update(id, hostName, status, errorMessage); } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogMapper.java b/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogMapper.java index 08bf5530..b819d7b6 100644 --- a/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogMapper.java @@ -8,5 +8,5 @@ public interface BatchLogMapper { boolean exists(String type); Long create(BatchLogCmd cmd); Long createError(String type, String hostName, String status, String errorMessage); - void update(Long id, String status, String errorMessage); + void update(Long id, String hostName, String status, String errorMessage); } diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortIn.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortIn.java index 037d39dd..f2d8b013 100644 --- a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortIn.java @@ -4,7 +4,7 @@ import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; public interface BatchLogPortIn { boolean exists(BatchLogType type); - Long create(BatchLogType type); + Long create(BatchLogType type, String hostName); void createError(BatchLogType type, String hostName, String status, String errorMessage); - void update(Long id, String status, String errorMessage); + void update(Long id, String hostName, String status, String errorMessage); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortOut.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortOut.java index 17410439..f480fb86 100644 --- a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortOut.java @@ -4,7 +4,7 @@ import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; public interface BatchLogPortOut { boolean exists(BatchLogType type); - Long create(BatchLogType type); + Long create(BatchLogType type, String hostName); void createError(BatchLogType type, String hostName, String status, String errorMessage); - void update(Long id, String status, String errorMessage); + void update(Long id, String hostName, String status, String errorMessage); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/BatchLogService.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/BatchLogService.java index 5a1054e1..9af233b0 100644 --- a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/BatchLogService.java +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/BatchLogService.java @@ -17,8 +17,8 @@ class BatchLogService implements BatchLogPortIn { } @Override - public Long create(BatchLogType type) { - return portOut.create(type); + public Long create(BatchLogType type, String hostName) { + return portOut.create(type, hostName); } @Override @@ -27,7 +27,7 @@ class BatchLogService implements BatchLogPortIn { } @Override - public void update(Long id, String status, String errorMessage) { - portOut.update(id, status, errorMessage); + public void update(Long id, String hostName, String status, String errorMessage) { + portOut.update(id, hostName, status, errorMessage); } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogCmd.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogCmd.java index 12899498..9fa1046c 100644 --- a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogCmd.java @@ -16,4 +16,5 @@ public class BatchLogCmd { private String type; private String status; private LocalDateTime startAt; + private String hostName; } diff --git a/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml b/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml index 0749c805..aca26ca4 100644 --- a/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml +++ b/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml @@ -19,8 +19,8 @@ SELECT nextval('batch_log_seq') - INSERT INTO batch_log (id, type, status, start_at, created_at) - VALUES (#{id}, #{type}, #{status}, #{startAt}, now()) + INSERT INTO batch_log (id, type, status, start_at, created_at, created_host) + VALUES (#{id}, #{type}, #{status}, #{startAt}, now(), #{hostName}) @@ -38,7 +38,8 @@ UPDATE batch_log SET status = #{status}, error_message = #{errorMessage}, - end_at = now() + end_at = now(), + created_host = #{hostName} WHERE id = #{id} \ No newline at end of file From 84c240706251c56578c0f42b06f4bfec92d38e98 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Mon, 21 Jul 2025 11:09:38 +0900 Subject: [PATCH 07/59] =?UTF-8?q?[BO]=20=EC=9E=84=EA=B0=80=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=20=EC=97=91=EC=85=80=20=EC=97=85=EB=A1=9C=EB=93=9C=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20:=20getCellNumberValu?= =?UTF-8?q?e=20->=20String=EC=9D=B4=EB=82=98=20FORMULA=20=ED=83=80?= =?UTF-8?q?=EC=9E=85=EC=9C=BC=EB=A1=9C=20=EC=9C=BC=EB=A1=9C=20=EB=93=A4?= =?UTF-8?q?=EC=96=B4=EC=98=AC=20=EA=B2=BD=EC=9A=B0=20=EB=B0=98=ED=99=98?= =?UTF-8?q?=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExcelUploadCreateHouseholdDao.java | 17 ++++++++++++++++- .../households/modal/modal-excel-household.html | 1 + 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java index 29156be3..106f375b 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java @@ -131,7 +131,7 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut } } workbook.close(); - return new ExcelUploadResultVO(sheet.getLastRowNum()-1 , success, errorList); + return new ExcelUploadResultVO(sheet.getLastRowNum() , success, errorList); } // 셀 값을 문자열로 변환 @@ -147,8 +147,23 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut // 셀 값을 문자열로 변환 private Integer getCellNumberValue(Cell cell) { if (cell == null) return null; + return switch (cell.getCellType()) { case NUMERIC -> (int) cell.getNumericCellValue(); + case STRING -> { + try { + yield Integer.parseInt(cell.getStringCellValue().trim()); + } catch (NumberFormatException e) { + yield null; + } + } + case FORMULA -> { + try { + yield (int) cell.getNumericCellValue(); + } catch (Exception e) { + yield null; + } + } default -> null; }; } diff --git a/admin/src/main/resources/templates/households/modal/modal-excel-household.html b/admin/src/main/resources/templates/households/modal/modal-excel-household.html index f696c277..01b3839d 100644 --- a/admin/src/main/resources/templates/households/modal/modal-excel-household.html +++ b/admin/src/main/resources/templates/households/modal/modal-excel-household.html @@ -74,6 +74,7 @@ ajaxUtil._hideWaiting(); // 로딩바 hide alert("총 "+res.total+"건 중에 "+res.success+"건 등록되었습니다."); + document.querySelector(".modal-excel-household").ui.close(); }, statusCode: { 422: (res) => { From f58688d1d3e0e36ffc963bb8d442ff895f4ac3b9 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Mon, 21 Jul 2025 11:11:26 +0900 Subject: [PATCH 08/59] =?UTF-8?q?[=EB=B0=B0=EC=B9=98]=20log=20->=20safeLog?= =?UTF-8?q?ger=20=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/admin/config/application/batch/BatchLogRunner.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java b/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java index 66c01350..f35a455c 100644 --- a/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java +++ b/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java @@ -11,7 +11,6 @@ import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor -@Slf4j public class BatchLogRunner { SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(BatchLogRunner.class)); @@ -29,7 +28,7 @@ public class BatchLogRunner { hostName = java.net.InetAddress.getLocalHost().getHostName(); } catch (UnknownHostException e) { hostName = "UNKNOWN"; - log.warn("호스트 이름 조회 실패", e); + safeLogger.warn("호스트 이름 조회 실패", e); } // 실행 로그 insert (RUNNING) From 2c2bfee88ea7cc96ae9e0825dd26dc63db15454f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Mon, 21 Jul 2025 12:22:45 +0900 Subject: [PATCH 09/59] =?UTF-8?q?=EC=9E=84=EC=82=B0=EB=AC=BC=20=ED=98=84?= =?UTF-8?q?=ED=99=A9=20class=EC=B6=94=EA=B0=80=20=EB=B0=8F=20fn=5Fmonthly?= =?UTF-8?q?=5Finput=5Fstatus=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapters/persistence/CreateHouseholdMapper.java | 1 + .../adapters/persistence/ExcelUploadCreateHouseholdDao.java | 6 +++++- .../resources/mappers/household/CreateHouseholdMapper.xml | 4 ++++ .../src/main/resources/templates/info/monthly/monthlys.html | 3 ++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java index 42ec09f8..b72d93ff 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java @@ -10,4 +10,5 @@ public interface CreateHouseholdMapper { Integer createHousehold(CreateHouseholdOutCmd outCmd); void createHouseholdHasRole(CreateHouseholdHasRoleCmd cmd); void createResearcherHasHousehold(CreateResearcherHasHouseholdCmd cmd); + void createHouseholdMonthlyInputStatus(); } diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java index 29156be3..8bf4c352 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java @@ -131,6 +131,8 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut } } workbook.close(); + + createHouseholdMapper.createHouseholdMonthlyInputStatus(); return new ExcelUploadResultVO(sheet.getLastRowNum()-1 , success, errorList); } @@ -195,7 +197,9 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut private Boolean getIsPanel(Cell cell){ if (cell == null) return null; String[] isPanel = cell.getStringCellValue().trim().split("\\."); - return "1".equals(isPanel[0]) || "유지".equals(isPanel[1]); + if(isPanel.length == 1 ) return "1".equals(isPanel[0]) || "유지".equals(isPanel[0]); + if(isPanel.length == 2 ) return "1".equals(isPanel[0]) || "유지".equals(isPanel[1]); + return false; } private Long getResearcherSeq(Cell cell){ diff --git a/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml b/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml index fc94174b..879f1f77 100644 --- a/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml +++ b/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml @@ -93,4 +93,8 @@ ) + + \ No newline at end of file diff --git a/front/src/main/resources/templates/info/monthly/monthlys.html b/front/src/main/resources/templates/info/monthly/monthlys.html index 69478689..82c1c293 100644 --- a/front/src/main/resources/templates/info/monthly/monthlys.html +++ b/front/src/main/resources/templates/info/monthly/monthlys.html @@ -13,7 +13,8 @@