From 0731deecf9b68749f93541ffe563c82469d64b21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Wed, 9 Jul 2025 16:04:54 +0900 Subject: [PATCH] SendAutoSms Connection TEST --- .../config/application/bean/KRIConfig.java | 67 +++++++++++++++++++ .../config/application/bean/MMSDBConfig.java | 63 +++++++++++++++++ .../adapters/web/AutoSchedulesController.java | 10 +-- .../ports/AutoSchedulesPortIn.java | 1 + .../application/AutoSchedulesService.java | 31 ++++++++- .../domain/GetIncompleteHouseholds.java | 6 +- .../mms/adapters/persistence/MMSDao.java | 34 ++++++++++ .../mms/adapters/persistence/MMSMapper.java | 9 +++ .../java/app/module/mms/ports/MMSPortIn.java | 10 +++ .../java/app/module/mms/ports/MMSPortOut.java | 10 +++ .../mms/ports/application/MMSService.java | 25 +++++++ .../domain/CreateSmsAutoSendCmd.java | 19 ++++++ .../src/main/resources/application-local.yml | 23 ++++++- admin/src/main/resources/application.yml | 4 +- .../main/resources/mappers/mms/MMSMapper.xml | 32 +++++++++ 15 files changed, 331 insertions(+), 13 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/config/application/bean/KRIConfig.java create mode 100644 admin/src/main/java/app/module/admin/config/application/bean/MMSDBConfig.java create mode 100644 admin/src/main/java/app/module/mms/adapters/persistence/MMSDao.java create mode 100644 admin/src/main/java/app/module/mms/adapters/persistence/MMSMapper.java create mode 100644 admin/src/main/java/app/module/mms/ports/MMSPortIn.java create mode 100644 admin/src/main/java/app/module/mms/ports/MMSPortOut.java create mode 100644 admin/src/main/java/app/module/mms/ports/application/MMSService.java create mode 100644 admin/src/main/java/app/module/mms/ports/application/domain/CreateSmsAutoSendCmd.java create mode 100644 admin/src/main/resources/mappers/mms/MMSMapper.xml diff --git a/admin/src/main/java/app/module/admin/config/application/bean/KRIConfig.java b/admin/src/main/java/app/module/admin/config/application/bean/KRIConfig.java new file mode 100644 index 00000000..161a565a --- /dev/null +++ b/admin/src/main/java/app/module/admin/config/application/bean/KRIConfig.java @@ -0,0 +1,67 @@ +package app.module.admin.config.application.bean; + +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.session.SqlSessionFactory; +import org.mybatis.spring.SqlSessionFactoryBean; +import org.mybatis.spring.SqlSessionTemplate; +import org.mybatis.spring.annotation.MapperScan; +import org.mybatis.spring.boot.autoconfigure.SpringBootVFS; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.jdbc.DataSourceBuilder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.core.io.support.PathMatchingResourcePatternResolver; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +import javax.sql.DataSource; +import java.io.IOException; + +@Slf4j +@Configuration +@MapperScan( + basePackages = { "app.module.admin", "app.module.core" }, + annotationClass = org.apache.ibatis.annotations.Mapper.class, + sqlSessionFactoryRef = "kriSqlSessionFactory") +@EnableTransactionManagement +public class KRIConfig { + + @Value("${mybatis.mapper-locations.kri}") + private String mybatisMapper; + + @Primary + @Bean(name = "kriDataSource") + @ConfigurationProperties(prefix = "spring.datasource.kri") + public DataSource kriDataSource() { + return DataSourceBuilder.create().build(); + } + + @Primary + @Bean(name = "kriSqlSessionFactory") + public SqlSessionFactory kriSqlSessionFactory(@Qualifier("kriDataSource") DataSource dataSource) throws Exception { + SqlSessionFactoryBean sessionFactoryBean = new SqlSessionFactoryBean(); + sessionFactoryBean.setVfs(SpringBootVFS.class); + configureSqlSessionFactory(sessionFactoryBean, dataSource); + return sessionFactoryBean.getObject(); + } + + protected void configureSqlSessionFactory(SqlSessionFactoryBean sessionFactoryBean, DataSource dataSource) throws IOException { + sessionFactoryBean.setDataSource(dataSource); + PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); + sessionFactoryBean.setMapperLocations(resolver.getResources(mybatisMapper)); + +// org.apache.ibatis.session.Configuration configuration = new org.apache.ibatis.session.Configuration(); +// configuration.setMapUnderscoreToCamelCase(true); +// configuration.setJdbcTypeForNull(null); +// sessionFactoryBean.setConfiguration(configuration); + } + + @Primary + @Bean(name = "kriSqlSessionTemplate") + public SqlSessionTemplate kriSqlSessionTemplate(@Qualifier("kriSqlSessionFactory") SqlSessionFactory sqlSessionFactory) { + SqlSessionTemplate sqlSessionTemplate = new SqlSessionTemplate(sqlSessionFactory); + return sqlSessionTemplate; + } +} diff --git a/admin/src/main/java/app/module/admin/config/application/bean/MMSDBConfig.java b/admin/src/main/java/app/module/admin/config/application/bean/MMSDBConfig.java new file mode 100644 index 00000000..cc6cd405 --- /dev/null +++ b/admin/src/main/java/app/module/admin/config/application/bean/MMSDBConfig.java @@ -0,0 +1,63 @@ +package app.module.admin.config.application.bean; + +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.session.SqlSessionFactory; +import org.mybatis.spring.SqlSessionFactoryBean; +import org.mybatis.spring.SqlSessionTemplate; +import org.mybatis.spring.annotation.MapperScan; +import org.mybatis.spring.boot.autoconfigure.SpringBootVFS; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.jdbc.DataSourceBuilder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.io.support.PathMatchingResourcePatternResolver; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +import javax.sql.DataSource; +import java.io.IOException; + +@Slf4j +@Configuration +@MapperScan( + basePackages = "app.module.mms", + annotationClass = org.apache.ibatis.annotations.Mapper.class, + sqlSessionFactoryRef = "mmsSqlSessionFactory") +@EnableTransactionManagement +public class MMSDBConfig { + + @Value("${mybatis.mapper-locations.mms}") + private String mybatisMapper; + + @Bean + @ConfigurationProperties(prefix = "spring.datasource.mms") + public DataSource mmsDataSource() { + return DataSourceBuilder.create().build(); + } + + @Bean(name = "mmsSqlSessionFactory") + public SqlSessionFactory mmsSqlSessionFactory(@Qualifier("mmsDataSource") DataSource dataSource) throws Exception { + SqlSessionFactoryBean sessionFactoryBean = new SqlSessionFactoryBean(); + sessionFactoryBean.setVfs(SpringBootVFS.class); + configureSqlSessionFactory(sessionFactoryBean, dataSource); + return sessionFactoryBean.getObject(); + } + + protected void configureSqlSessionFactory(SqlSessionFactoryBean sessionFactoryBean, DataSource dataSource) throws IOException { + sessionFactoryBean.setDataSource(dataSource); + PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); + sessionFactoryBean.setMapperLocations(resolver.getResources(mybatisMapper)); + +// org.apache.ibatis.session.Configuration configuration = new org.apache.ibatis.session.Configuration(); +// configuration.setMapUnderscoreToCamelCase(true); +// configuration.setJdbcTypeForNull(null); +// sessionFactoryBean.setConfiguration(configuration); + } + + @Bean(name = "mmsSqlSessionTemplate") + public SqlSessionTemplate mmsSqlSessionTemplate(@Qualifier("mmsSqlSessionFactory") SqlSessionFactory sqlSessionFactory) { + SqlSessionTemplate sqlSessionTemplate = new SqlSessionTemplate(sqlSessionFactory); + return sqlSessionTemplate; + } +} 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 0e8553c7..f8780c5d 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 @@ -28,8 +28,10 @@ public class AutoSchedulesController { public void fetchSmsAutoSend() { portIn.sendAutoSms(); } - - /** - * TODO 스케쥴 있다면.. 추가. - */ + + // 매일 오후 5시 마다 실행되는 스케줄러 + @Scheduled(cron = "5 * * * * ?") + public void fetchSmsAutoSenTest() { + portIn.sendAutoSmsTest(); + } } diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortIn.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortIn.java index 2e78b5b3..7e4f4bb9 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortIn.java @@ -6,4 +6,5 @@ public interface AutoSchedulesPortIn { Optional operate(); Optional sendAutoSms(); + Optional sendAutoSmsTest(); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java index 88518fa2..3e710911 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java @@ -11,10 +11,9 @@ import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.GetIncomp import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholds; import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholdsCmd; import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.List; -import java.util.UUID; + +import app.module.mms.ports.MMSPortIn; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -27,6 +26,7 @@ import org.springframework.util.CollectionUtils; class AutoSchedulesService implements AutoSchedulesPortIn { private final AutoSchedulesPortOut portOut; + private final MMSPortIn mmsPortIn; private final GetSmsAutoStatusPortIn getSmsAutoStatusPortIn; private final GetIncompleteHouseholdsPortIn getIncompleteHouseholdsPortIn; @@ -76,4 +76,29 @@ class AutoSchedulesService implements AutoSchedulesPortIn { return Optional.of(true); } + + @Override + public Optional sendAutoSmsTest() { + String targetMonth = "202507"; + DayRange dayRange = new DayRange(1, 7); + GetSmsAutoStatus getSmsAutoStatus = new GetSmsAutoStatus(true, "테스트", "01012345678", null, null); + + // dayRange 날짜 범위의 일계부 미등록한 임가 목록 조회 + List incompleteHouseholds = getIncompleteHouseholdsPortIn.operate( + new GetIncompleteHouseholdsCmd(targetMonth, dayRange.getFromDay(), dayRange.getToDay()) + ); + + System.out.println(incompleteHouseholds); + + // 미등록 임가가 있을 경우에만 실행 + if(!CollectionUtils.isEmpty(incompleteHouseholds)) { + mmsPortIn.sendAutoSms(new app.module.mms.ports.application.domain.CreateSmsAutoSendCmd( + incompleteHouseholds, + getSmsAutoStatus.getSendPhone(), + getSmsAutoStatus.getMessage() + )); + } + + return Optional.of(true); + } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/application/domain/GetIncompleteHouseholds.java b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/application/domain/GetIncompleteHouseholds.java index d4b6a02f..7b9c3797 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/application/domain/GetIncompleteHouseholds.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/application/domain/GetIncompleteHouseholds.java @@ -1,14 +1,12 @@ package app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; +import lombok.*; @Getter @Setter @AllArgsConstructor @EqualsAndHashCode +@ToString public class GetIncompleteHouseholds { private Long seq; private String householdNum; diff --git a/admin/src/main/java/app/module/mms/adapters/persistence/MMSDao.java b/admin/src/main/java/app/module/mms/adapters/persistence/MMSDao.java new file mode 100644 index 00000000..7dbc2379 --- /dev/null +++ b/admin/src/main/java/app/module/mms/adapters/persistence/MMSDao.java @@ -0,0 +1,34 @@ +package app.module.mms.adapters.persistence; + +import app.module.mms.ports.application.domain.CreateSmsAutoSendCmd; +import app.module.mms.ports.MMSPortOut; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Optional; + +@Slf4j +@Repository +@RequiredArgsConstructor +public class MMSDao implements MMSPortOut { + + private final MMSMapper mapper; + + @Transactional + public Optional sendAutoSms(CreateSmsAutoSendCmd cmd) { + try { + log.debug("@@@ sendAutoSmsTest"); + + mapper.createSmsAutoSend(cmd); + + return Optional.of(true); + } catch (Exception e) { + log.info(e.getMessage()); + + // 예외 발생 시 false 반환 + return Optional.of(false); + } + } +} diff --git a/admin/src/main/java/app/module/mms/adapters/persistence/MMSMapper.java b/admin/src/main/java/app/module/mms/adapters/persistence/MMSMapper.java new file mode 100644 index 00000000..fa7ca337 --- /dev/null +++ b/admin/src/main/java/app/module/mms/adapters/persistence/MMSMapper.java @@ -0,0 +1,9 @@ +package app.module.mms.adapters.persistence; + +import app.module.mms.ports.application.domain.CreateSmsAutoSendCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface MMSMapper { + void createSmsAutoSend(CreateSmsAutoSendCmd cmd); +} diff --git a/admin/src/main/java/app/module/mms/ports/MMSPortIn.java b/admin/src/main/java/app/module/mms/ports/MMSPortIn.java new file mode 100644 index 00000000..6fbd5549 --- /dev/null +++ b/admin/src/main/java/app/module/mms/ports/MMSPortIn.java @@ -0,0 +1,10 @@ +package app.module.mms.ports; + +import app.module.mms.ports.application.domain.CreateSmsAutoSendCmd; + +import java.util.Optional; + +public interface MMSPortIn { + + Optional sendAutoSms(CreateSmsAutoSendCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/mms/ports/MMSPortOut.java b/admin/src/main/java/app/module/mms/ports/MMSPortOut.java new file mode 100644 index 00000000..d01fc3ff --- /dev/null +++ b/admin/src/main/java/app/module/mms/ports/MMSPortOut.java @@ -0,0 +1,10 @@ +package app.module.mms.ports; + +import app.module.mms.ports.application.domain.CreateSmsAutoSendCmd; + +import java.util.Optional; + +public interface MMSPortOut { + + Optional sendAutoSms(CreateSmsAutoSendCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/mms/ports/application/MMSService.java b/admin/src/main/java/app/module/mms/ports/application/MMSService.java new file mode 100644 index 00000000..170b03b1 --- /dev/null +++ b/admin/src/main/java/app/module/mms/ports/application/MMSService.java @@ -0,0 +1,25 @@ +package app.module.mms.ports.application; + +import app.module.mms.ports.application.domain.CreateSmsAutoSendCmd; +import app.module.mms.ports.MMSPortIn; +import app.module.mms.ports.MMSPortOut; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Optional; + +@Service +@RequiredArgsConstructor +class MMSService implements MMSPortIn { + + private final MMSPortOut portOut; + + @Transactional + public Optional sendAutoSms(CreateSmsAutoSendCmd command) { + portOut.sendAutoSms(command); + + return Optional.of(true); + } + +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/mms/ports/application/domain/CreateSmsAutoSendCmd.java b/admin/src/main/java/app/module/mms/ports/application/domain/CreateSmsAutoSendCmd.java new file mode 100644 index 00000000..f130db9b --- /dev/null +++ b/admin/src/main/java/app/module/mms/ports/application/domain/CreateSmsAutoSendCmd.java @@ -0,0 +1,19 @@ +package app.module.mms.ports.application.domain; + +import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholds; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +import java.util.List; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class CreateSmsAutoSendCmd { + private List sendHouseholds; + private String sendPhone; + private String message; +} diff --git a/admin/src/main/resources/application-local.yml b/admin/src/main/resources/application-local.yml index 567af0ca..6e29e077 100644 --- a/admin/src/main/resources/application-local.yml +++ b/admin/src/main/resources/application-local.yml @@ -23,4 +23,25 @@ spring: cache-duration: 10s thymeleaf: # 타임리프 템플릿 캐시 비활성화 (개발 환경에서는 false 로 설정 권장) - cache: false \ No newline at end of file + cache: false + + datasource: + kri: + driver-class-name: org.postgresql.Driver + jdbc-url: jdbc:postgresql://15.165.180.203:5432/korea_research + username: ko_research + password: koresearch1@#4 + mms: + driver-class-name: org.postgresql.Driver + jdbc-url: jdbc:postgresql://15.165.180.203:5432/ko_research_hyunjoo + username: hyunjoo + password: hyunjoo1@#4 + maximum-pool-size: 2 + minimum-idle: 1 + hikari: + maximum-pool-size: 10 + minimum-idle: 5 + idle-timeout: 120000 + max-lifetime: 900000 + connection-timeout: 5000 + leak-detection-threshold: 30000 diff --git a/admin/src/main/resources/application.yml b/admin/src/main/resources/application.yml index 20e1af8a..5c1ceb5e 100644 --- a/admin/src/main/resources/application.yml +++ b/admin/src/main/resources/application.yml @@ -101,6 +101,8 @@ logging: # MyBatis 설정 # ============================================== mybatis: - mapper-locations: classpath*:mappers/**/*Mapper.xml # 매퍼 파일 위치 + mapper-locations: + kri: classpath*:mappers/**/*Mapper.xml # 매퍼 파일 위치 + mms: classpath*:mappers/mms/*Mapper.xml # 매퍼 파일 위치 configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # SQL 로깅 구현체 diff --git a/admin/src/main/resources/mappers/mms/MMSMapper.xml b/admin/src/main/resources/mappers/mms/MMSMapper.xml new file mode 100644 index 00000000..a506a06f --- /dev/null +++ b/admin/src/main/resources/mappers/mms/MMSMapper.xml @@ -0,0 +1,32 @@ + + + + + + /* createSmsAutoSend : 문자 발송 insert */ + INSERT INTO biz_msg + ( + MSG_TYPE, + CMID, + REQUEST_TIME, + SEND_TIME, + DEST_PHONE, + SEND_PHONE, + MSG_BODY + ) + VALUES + + ( + 5, + TO_CHAR(NOW(), 'YYYYMMDDHH24MISS') || '_' || #{item.householdNum}, + NOW(), + NOW(), + #{item.phone}, + #{sendPhone}, + #{message} + ) + + + + \ No newline at end of file