Merge branch 'susu' into dev

# Conflicts:
#	admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java
#	admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortIn.java
#	admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java
This commit is contained in:
주수현
2025-07-10 14:22:17 +09:00
28 changed files with 749 additions and 34 deletions

View File

@@ -0,0 +1,34 @@
package app.module.admin.config.application.bean;
import org.jasypt.encryption.StringEncryptor;
import org.jasypt.encryption.pbe.PooledPBEStringEncryptor;
import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration
public class JasyptConfig {
@Value("${jasypt.encryptor.password}")
private String jasyptPassword;
@Value("${jasypt.encryptor.algorithm}")
private String jasyptAlgorithm;
@Bean("jasyptStringEncryptor")
public StringEncryptor stringEncryptor() {
SimpleStringPBEConfig config = new SimpleStringPBEConfig();
config.setPassword(jasyptPassword); // 암호화할 때 사용하는 키
config.setPoolSize("1"); // 인스턴스 pool
config.setAlgorithm(jasyptAlgorithm); // 암호화 알고리즘
config.setStringOutputType("base64"); // 인코딩 방식
config.setKeyObtentionIterations("1000"); // 반복할 해싱 회수
config.setSaltGeneratorClassName("org.jasypt.salt.RandomSaltGenerator"); // salt 생성 클래스
config.setIvGeneratorClassName("org.jasypt.iv.RandomIvGenerator");
PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor();
encryptor.setConfig(config);
return encryptor;
}
}

View File

@@ -0,0 +1,66 @@
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);
sessionFactoryBean.setConfiguration(configuration);
}
@Primary
@Bean(name = "kriSqlSessionTemplate")
public SqlSessionTemplate kriSqlSessionTemplate(@Qualifier("kriSqlSessionFactory") SqlSessionFactory sqlSessionFactory) {
SqlSessionTemplate sqlSessionTemplate = new SqlSessionTemplate(sqlSessionFactory);
return sqlSessionTemplate;
}
}

View File

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

View File

@@ -1,6 +1,9 @@
package app.module.admin.usecase.schedule.autoSchedules.adapters.web;
import app.module.admin.config.application.util.DateUiUtil;
import app.module.admin.config.application.util.model.DayRange;
import app.module.admin.usecase.schedule.autoSchedules.ports.AutoSchedulesPortIn;
import java.time.LocalDate;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -34,8 +37,14 @@ public class AutoSchedulesController {
public void fetchMonthlyCarryOver() {
portIn.monthlyCarryOver();
}
/**
* TODO 스케쥴 있다면.. 추가.
*/
// 매일 오후 5시 마다 실행되는 스케줄러
@Scheduled(cron = "0 1 * * * ?")
public void fetchSmsAutoSenTest() {
portIn.sendAutoSmsTest();
}
}

View File

@@ -7,4 +7,5 @@ public interface AutoSchedulesPortIn {
Optional<Boolean> operate();
Optional<Boolean> sendAutoSms();
Optional<Boolean> monthlyCarryOver();
Optional<Boolean> sendAutoSmsTest();
}

View File

@@ -13,6 +13,7 @@ import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.applicati
import java.time.LocalDate;
import java.util.List;
import app.module.mms.ports.MMSPortIn;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -25,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;
@@ -75,6 +77,31 @@ class AutoSchedulesService implements AutoSchedulesPortIn {
return Optional.of(true);
}
@Override
public Optional<Boolean> sendAutoSmsTest() {
String targetMonth = "202507";
DayRange dayRange = new DayRange(1, 7);
GetSmsAutoStatus getSmsAutoStatus = new GetSmsAutoStatus(true, "테스트", "01012345678", null, null);
// dayRange 날짜 범위의 일계부 미등록한 임가 목록 조회
List<GetIncompleteHouseholds> 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);
}
@Override
public Optional<Boolean> monthlyCarryOver() {
return portOut.monthlyCarryOver();

View File

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

View File

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

View File

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

View File

@@ -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<Boolean> sendAutoSms(CreateSmsAutoSendCmd cmd);
}

View File

@@ -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<Boolean> sendAutoSms(CreateSmsAutoSendCmd cmd);
}

View File

@@ -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<Boolean> sendAutoSms(CreateSmsAutoSendCmd command) {
portOut.sendAutoSms(command);
return Optional.of(true);
}
}

View File

@@ -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<GetIncompleteHouseholds> sendHouseholds;
private String sendPhone;
private String message;
}