Commit @b517754d014f3736fb00ca8bd0a5e6040e1c4be7

dsjang 2024-08-07

Multi DBMS 설정 기능 개선

@b517754d014f3736fb00ca8bd0a5e6040e1c4be7

2477085

b517754

build.gradle

--- build.gradle

+++ build.gradle


     implementation 'org.jdom:jdom2:2.0.6.1'
     // https://mvnrepository.com/artifact/org.apache.commons/commons-configuration2
     implementation 'org.apache.commons:commons-configuration2:2.10.1'
+    // https://mvnrepository.com/artifact/com.oracle.database.jdbc/ojdbc11
+    implementation group: 'com.oracle.database.jdbc', name: 'ojdbc11', version: '23.5.0.24.07'
+    // https://mvnrepository.com/artifact/com.microsoft.sqlserver/mssql-jdbc
+    implementation group: 'com.microsoft.sqlserver', name: 'mssql-jdbc', version: '12.8.0.jre11'
+    // https://mvnrepository.com/artifact/org.postgresql/postgresql
+    implementation group: 'org.postgresql', name: 'postgresql', version: '42.7.3'
+
 }
 
 tasks.named('test') {

2477085

b517754

src/main/java/com/munjaon/client/config/DataSourceConfig.java

--- src/main/java/com/munjaon/client/config/DataSourceConfig.java

+++ src/main/java/com/munjaon/client/config/DataSourceConfig.java


 package com.munjaon.client.config;
 
 import com.zaxxer.hikari.HikariDataSource;
-import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.configuration2.ex.ConfigurationException;

 import org.mybatis.spring.annotation.MapperScan;
 import org.mybatis.spring.boot.autoconfigure.SpringBootVFS;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;

 @EnableTransactionManagement
 @MapperScan(basePackages= "com.munjaon.client.**.mapper")
 public class DataSourceConfig {
+    //public class DataSourceConfig implements BeanDefinitionRegistryPostProcessor {
     @Autowired
     private ApplicationContext applicationContext;
     private final ServerConfig serverConfig;

     @Primary
     @Bean(name = "factory")
     public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception {
+        String dbms = serverConfig.getString("DB.DBMS");
+        System.out.println("dbms : " + dbms);
         SqlSessionFactoryBean sqlSessionFactory = new SqlSessionFactoryBean();
         sqlSessionFactory.setVfs(SpringBootVFS.class);
         sqlSessionFactory.setDataSource(dataSource);
         sqlSessionFactory.setTypeAliasesPackage("com.munjaon.client.**.dto");
         sqlSessionFactory.setConfigLocation(applicationContext.getResource("classpath:mybatis-config.xml"));
         sqlSessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:/sqlmap/**/*.xml"));
+//        sqlSessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:/sqlmap/" + dbms.toLowerCase() + "/*.xml"));
         return sqlSessionFactory.getObject();
     }
 

     public SqlSessionTemplate sqlSession(SqlSessionFactory sqlSessionFactory) {
         return new SqlSessionTemplate(sqlSessionFactory);
     }
+
+//    @Override
+//    public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
+//        String dbms = null;
+//        try {
+//            dbms = serverConfig.getString("DB.DBMS");
+//        } catch (ConfigurationException e) {
+//            throw new RuntimeException(e);
+//        }
+//        AbstractBeanDefinition mapperScannerConfigurer = BeanDefinitionBuilder
+//                .genericBeanDefinition(MapperScannerConfigurer.class)
+//                .addPropertyValue("sqlSessionFactoryBeanName", "factory")
+//                .addPropertyValue("basePackage", "com.munjaon.client.**.dto")
+//                .addPropertyValue("annotationClass", MapperType.value(dbms).getClass())
+//                .getBeanDefinition();
+//
+//        registry.registerBeanDefinition("MapperScanner", mapperScannerConfigurer);
+//    }
 }

2477085

b517754

src/main/java/com/munjaon/client/mariadb/service/MariaDBService.java

--- src/main/java/com/munjaon/client/mariadb/service/MariaDBService.java

+++ src/main/java/com/munjaon/client/mariadb/service/MariaDBService.java


 @Service
 @RequiredArgsConstructor
 public class MariaDBService {
-    private final MariaDBMapper mariaDBMapper;
+    private final MariaDBMapper deliverBMapper;
 
     public boolean checkTableExists() {
         boolean isExist = false;
         try {
-            int msgCount = mariaDBMapper.checkTableForMessage();
-            int logCount = mariaDBMapper.checkTableForLog();
-            if (msgCount > 0 && logCount > 0) {
+            int msgCount = deliverBMapper.checkTableForMessage();
+            int logCount = deliverBMapper.checkTableForLog();
+            if (msgCount >= 0 && logCount >= 0) {
                 isExist = true;
             }
         } catch (Exception e) {

         return isExist;
     }
     public List<MunjaonMsg> selectToDeliver(String msgType) {
-        return mariaDBMapper.selectToDeliver(msgType);
+        return deliverBMapper.selectToDeliver(msgType);
     }
     public int updateToDeliver(String msgId) {
-        return mariaDBMapper.updateToDeliver(msgId);
+        return deliverBMapper.updateToDeliver(msgId);
     }
     public int updateToReport(MunjaonMsg params) {
-        return mariaDBMapper.updateToReport(params);
+        return deliverBMapper.updateToReport(params);
     }
     public List<MunjaonMsg> selectToMove() {
-        return mariaDBMapper.selectToMove();
+        return deliverBMapper.selectToMove();
     }
     public List<MunjaonMsg> selectToExpire(String expireTime) {
-        return mariaDBMapper.selectToExpire(expireTime);
+        return deliverBMapper.selectToExpire(expireTime);
     }
     public int insertToLog(String msgId) {
-        return mariaDBMapper.insertToLog(msgId);
+        return deliverBMapper.insertToLog(msgId);
     }
     public int deleteFromDeliver(String msgId) {
-        return mariaDBMapper.deleteFromDeliver(msgId);
+        return deliverBMapper.deleteFromDeliver(msgId);
     }
 
     @Transactional

b517754

src/main/java/com/munjaon/client/mssql/mapper/MssqlMapper.java (added)

+++ src/main/java/com/munjaon/client/mssql/mapper/MssqlMapper.java

...	...	@@ -0,0 +1,20 @@
	1	+package com.munjaon.client.mssql.mapper;
	2	+
	3	+import com.munjaon.client.model.MunjaonMsg;
	4	+import org.apache.ibatis.annotations.Mapper;
	5	+
	6	+import java.util.List;
	7	+
	8	+@Mapper
	9	+public interface MssqlMapper {
	10	+ String checkTime();
	11	+ int checkTableForMessage();
	12	+ int checkTableForLog();
	13	+ List<MunjaonMsg> selectToDeliver(String msgType);
	14	+ int updateToDeliver(String msgId);
	15	+ int updateToReport(MunjaonMsg params);
	16	+ List<MunjaonMsg> selectToMove();
	17	+ List<MunjaonMsg> selectToExpire(String expireTime);
	18	+ int insertToLog(String msgId);
	19	+ int deleteFromDeliver(String msgId);
	20	+}

b517754

src/main/java/com/munjaon/client/mssql/service/MssqlService.java (added)

+++ src/main/java/com/munjaon/client/mssql/service/MssqlService.java

...	...	@@ -0,0 +1,66 @@
	1	+package com.munjaon.client.mssql.service;
	2	+
	3	+import com.munjaon.client.model.MunjaonMsg;
	4	+import com.munjaon.client.mssql.mapper.MssqlMapper;
	5	+import lombok.RequiredArgsConstructor;
	6	+import lombok.extern.slf4j.Slf4j;
	7	+import org.springframework.stereotype.Service;
	8	+import org.springframework.transaction.annotation.Transactional;
	9	+
	10	+import java.util.List;
	11	+
	12	+@Slf4j
	13	+@Service
	14	+@RequiredArgsConstructor
	15	+public class MssqlService {
	16	+ private final MssqlMapper deliverBMapper;
	17	+
	18	+ public boolean checkTableExists() {
	19	+ boolean isExist = false;
	20	+ try {
	21	+ int msgCount = deliverBMapper.checkTableForMessage();
	22	+ int logCount = deliverBMapper.checkTableForLog();
	23	+ if (msgCount >= 0 && logCount >= 0) {
	24	+ isExist = true;
	25	+ }
	26	+ } catch (Exception e) {
	27	+ log.error("Check table exists error : {}", e);
	28	+ }
	29	+
	30	+ return isExist;
	31	+ }
	32	+ public List<MunjaonMsg> selectToDeliver(String msgType) {
	33	+ return deliverBMapper.selectToDeliver(msgType);
	34	+ }
	35	+ public int updateToDeliver(String msgId) {
	36	+ return deliverBMapper.updateToDeliver(msgId);
	37	+ }
	38	+ public int updateToReport(MunjaonMsg params) {
	39	+ return deliverBMapper.updateToReport(params);
	40	+ }
	41	+ public List<MunjaonMsg> selectToMove() {
	42	+ return deliverBMapper.selectToMove();
	43	+ }
	44	+ public List<MunjaonMsg> selectToExpire(String expireTime) {
	45	+ return deliverBMapper.selectToExpire(expireTime);
	46	+ }
	47	+ public int insertToLog(String msgId) {
	48	+ return deliverBMapper.insertToLog(msgId);
	49	+ }
	50	+ public int deleteFromDeliver(String msgId) {
	51	+ return deliverBMapper.deleteFromDeliver(msgId);
	52	+ }
	53	+
	54	+ @Transactional
	55	+ public void moveToDeliver() {
	56	+ List<MunjaonMsg> list = selectToMove();
	57	+ if (list == null \|\| list.size() == 0) {
	58	+ return;
	59	+ }
	60	+ log.debug("[CLASS : {} : MOVE_COUNT : {}", this.getClass(), list.size());
	61	+ for (MunjaonMsg msg : list) {
	62	+ insertToLog(msg.getMsgId());
	63	+ deleteFromDeliver(msg.getMsgId());
	64	+ }
	65	+ }
	66	+}

b517754

src/main/java/com/munjaon/client/mysql/mapper/MysqlMapper.java (added)

+++ src/main/java/com/munjaon/client/mysql/mapper/MysqlMapper.java

...	...	@@ -0,0 +1,20 @@
	1	+package com.munjaon.client.mysql.mapper;
	2	+
	3	+import com.munjaon.client.model.MunjaonMsg;
	4	+import org.apache.ibatis.annotations.Mapper;
	5	+
	6	+import java.util.List;
	7	+
	8	+@Mapper
	9	+public interface MysqlMapper {
	10	+ String checkTime();
	11	+ int checkTableForMessage();
	12	+ int checkTableForLog();
	13	+ List<MunjaonMsg> selectToDeliver(String msgType);
	14	+ int updateToDeliver(String msgId);
	15	+ int updateToReport(MunjaonMsg params);
	16	+ List<MunjaonMsg> selectToMove();
	17	+ List<MunjaonMsg> selectToExpire(String expireTime);
	18	+ int insertToLog(String msgId);
	19	+ int deleteFromDeliver(String msgId);
	20	+}

2477085

b517754

src/main/java/com/munjaon/client/mysql/service/MysqlService.java

--- src/main/java/com/munjaon/client/mysql/service/MysqlService.java

+++ src/main/java/com/munjaon/client/mysql/service/MysqlService.java


 package com.munjaon.client.mysql.service;
 
+import com.munjaon.client.model.MunjaonMsg;
+import com.munjaon.client.mysql.mapper.MysqlMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 @Slf4j
 @Service
 @RequiredArgsConstructor
 public class MysqlService {
+    private final MysqlMapper deliverBMapper;
+
+    public boolean checkTableExists() {
+        boolean isExist = false;
+        try {
+            int msgCount = deliverBMapper.checkTableForMessage();
+            int logCount = deliverBMapper.checkTableForLog();
+            if (msgCount >= 0 && logCount >= 0) {
+                isExist = true;
+            }
+        } catch (Exception e) {
+            log.error("Check table exists error : {}", e);
+        }
+
+        return isExist;
+    }
+    public List<MunjaonMsg> selectToDeliver(String msgType) {
+        return deliverBMapper.selectToDeliver(msgType);
+    }
+    public int updateToDeliver(String msgId) {
+        return deliverBMapper.updateToDeliver(msgId);
+    }
+    public int updateToReport(MunjaonMsg params) {
+        return deliverBMapper.updateToReport(params);
+    }
+    public List<MunjaonMsg> selectToMove() {
+        return deliverBMapper.selectToMove();
+    }
+    public List<MunjaonMsg> selectToExpire(String expireTime) {
+        return deliverBMapper.selectToExpire(expireTime);
+    }
+    public int insertToLog(String msgId) {
+        return deliverBMapper.insertToLog(msgId);
+    }
+    public int deleteFromDeliver(String msgId) {
+        return deliverBMapper.deleteFromDeliver(msgId);
+    }
+
+    @Transactional
+    public void moveToDeliver() {
+        List<MunjaonMsg> list = selectToMove();
+        if (list == null || list.size() == 0) {
+            return;
+        }
+        log.debug("[CLASS : {} : MOVE_COUNT : {}", this.getClass(), list.size());
+        for (MunjaonMsg msg : list) {
+            insertToLog(msg.getMsgId());
+            deleteFromDeliver(msg.getMsgId());
+        }
+    }
 }

b517754

src/main/java/com/munjaon/client/oracle/mapper/OracleMapper.java (added)

+++ src/main/java/com/munjaon/client/oracle/mapper/OracleMapper.java

...	...	@@ -0,0 +1,20 @@
	1	+package com.munjaon.client.oracle.mapper;
	2	+
	3	+import com.munjaon.client.model.MunjaonMsg;
	4	+import org.apache.ibatis.annotations.Mapper;
	5	+
	6	+import java.util.List;
	7	+
	8	+@Mapper
	9	+public interface OracleMapper {
	10	+ String checkTime();
	11	+ int checkTableForMessage();
	12	+ int checkTableForLog();
	13	+ List<MunjaonMsg> selectToDeliver(String msgType);
	14	+ int updateToDeliver(String msgId);
	15	+ int updateToReport(MunjaonMsg params);
	16	+ List<MunjaonMsg> selectToMove();
	17	+ List<MunjaonMsg> selectToExpire(String expireTime);
	18	+ int insertToLog(String msgId);
	19	+ int deleteFromDeliver(String msgId);
	20	+}

b517754

src/main/java/com/munjaon/client/oracle/service/OracleService.java (added)

+++ src/main/java/com/munjaon/client/oracle/service/OracleService.java

...	...	@@ -0,0 +1,66 @@
	1	+package com.munjaon.client.oracle.service;
	2	+
	3	+import com.munjaon.client.model.MunjaonMsg;
	4	+import com.munjaon.client.oracle.mapper.OracleMapper;
	5	+import lombok.RequiredArgsConstructor;
	6	+import lombok.extern.slf4j.Slf4j;
	7	+import org.springframework.stereotype.Service;
	8	+import org.springframework.transaction.annotation.Transactional;
	9	+
	10	+import java.util.List;
	11	+
	12	+@Slf4j
	13	+@Service
	14	+@RequiredArgsConstructor
	15	+public class OracleService {
	16	+ private final OracleMapper deliverBMapper;
	17	+
	18	+ public boolean checkTableExists() {
	19	+ boolean isExist = false;
	20	+ try {
	21	+ int msgCount = deliverBMapper.checkTableForMessage();
	22	+ int logCount = deliverBMapper.checkTableForLog();
	23	+ if (msgCount >= 0 && logCount >= 0) {
	24	+ isExist = true;
	25	+ }
	26	+ } catch (Exception e) {
	27	+ log.error("Check table exists error : {}", e);
	28	+ }
	29	+
	30	+ return isExist;
	31	+ }
	32	+ public List<MunjaonMsg> selectToDeliver(String msgType) {
	33	+ return deliverBMapper.selectToDeliver(msgType);
	34	+ }
	35	+ public int updateToDeliver(String msgId) {
	36	+ return deliverBMapper.updateToDeliver(msgId);
	37	+ }
	38	+ public int updateToReport(MunjaonMsg params) {
	39	+ return deliverBMapper.updateToReport(params);
	40	+ }
	41	+ public List<MunjaonMsg> selectToMove() {
	42	+ return deliverBMapper.selectToMove();
	43	+ }
	44	+ public List<MunjaonMsg> selectToExpire(String expireTime) {
	45	+ return deliverBMapper.selectToExpire(expireTime);
	46	+ }
	47	+ public int insertToLog(String msgId) {
	48	+ return deliverBMapper.insertToLog(msgId);
	49	+ }
	50	+ public int deleteFromDeliver(String msgId) {
	51	+ return deliverBMapper.deleteFromDeliver(msgId);
	52	+ }
	53	+
	54	+ @Transactional
	55	+ public void moveToDeliver() {
	56	+ List<MunjaonMsg> list = selectToMove();
	57	+ if (list == null \|\| list.size() == 0) {
	58	+ return;
	59	+ }
	60	+ log.debug("[CLASS : {} : MOVE_COUNT : {}", this.getClass(), list.size());
	61	+ for (MunjaonMsg msg : list) {
	62	+ insertToLog(msg.getMsgId());
	63	+ deleteFromDeliver(msg.getMsgId());
	64	+ }
	65	+ }
	66	+}

b517754

src/main/java/com/munjaon/client/postgresql/mapper/PostgresqlMapper.java (added)

+++ src/main/java/com/munjaon/client/postgresql/mapper/PostgresqlMapper.java

...	...	@@ -0,0 +1,20 @@
	1	+package com.munjaon.client.postgresql.mapper;
	2	+
	3	+import com.munjaon.client.model.MunjaonMsg;
	4	+import org.apache.ibatis.annotations.Mapper;
	5	+
	6	+import java.util.List;
	7	+
	8	+@Mapper
	9	+public interface PostgresqlMapper {
	10	+ String checkTime();
	11	+ int checkTableForMessage();
	12	+ int checkTableForLog();
	13	+ List<MunjaonMsg> selectToDeliver(String msgType);
	14	+ int updateToDeliver(String msgId);
	15	+ int updateToReport(MunjaonMsg params);
	16	+ List<MunjaonMsg> selectToMove();
	17	+ List<MunjaonMsg> selectToExpire(String expireTime);
	18	+ int insertToLog(String msgId);
	19	+ int deleteFromDeliver(String msgId);
	20	+}

b517754

src/main/java/com/munjaon/client/postgresql/service/PostgresqlService.java (added)

+++ src/main/java/com/munjaon/client/postgresql/service/PostgresqlService.java

...	...	@@ -0,0 +1,66 @@
	1	+package com.munjaon.client.postgresql.service;
	2	+
	3	+import com.munjaon.client.model.MunjaonMsg;
	4	+import com.munjaon.client.postgresql.mapper.PostgresqlMapper;
	5	+import lombok.RequiredArgsConstructor;
	6	+import lombok.extern.slf4j.Slf4j;
	7	+import org.springframework.stereotype.Service;
	8	+import org.springframework.transaction.annotation.Transactional;
	9	+
	10	+import java.util.List;
	11	+
	12	+@Slf4j
	13	+@Service
	14	+@RequiredArgsConstructor
	15	+public class PostgresqlService {
	16	+ private final PostgresqlMapper deliverBMapper;
	17	+
	18	+ public boolean checkTableExists() {
	19	+ boolean isExist = false;
	20	+ try {
	21	+ int msgCount = deliverBMapper.checkTableForMessage();
	22	+ int logCount = deliverBMapper.checkTableForLog();
	23	+ if (msgCount >= 0 && logCount >= 0) {
	24	+ isExist = true;
	25	+ }
	26	+ } catch (Exception e) {
	27	+ log.error("Check table exists error : {}", e);
	28	+ }
	29	+
	30	+ return isExist;
	31	+ }
	32	+ public List<MunjaonMsg> selectToDeliver(String msgType) {
	33	+ return deliverBMapper.selectToDeliver(msgType);
	34	+ }
	35	+ public int updateToDeliver(String msgId) {
	36	+ return deliverBMapper.updateToDeliver(msgId);
	37	+ }
	38	+ public int updateToReport(MunjaonMsg params) {
	39	+ return deliverBMapper.updateToReport(params);
	40	+ }
	41	+ public List<MunjaonMsg> selectToMove() {
	42	+ return deliverBMapper.selectToMove();
	43	+ }
	44	+ public List<MunjaonMsg> selectToExpire(String expireTime) {
	45	+ return deliverBMapper.selectToExpire(expireTime);
	46	+ }
	47	+ public int insertToLog(String msgId) {
	48	+ return deliverBMapper.insertToLog(msgId);
	49	+ }
	50	+ public int deleteFromDeliver(String msgId) {
	51	+ return deliverBMapper.deleteFromDeliver(msgId);
	52	+ }
	53	+
	54	+ @Transactional
	55	+ public void moveToDeliver() {
	56	+ List<MunjaonMsg> list = selectToMove();
	57	+ if (list == null \|\| list.size() == 0) {
	58	+ return;
	59	+ }
	60	+ log.debug("[CLASS : {} : MOVE_COUNT : {}", this.getClass(), list.size());
	61	+ for (MunjaonMsg msg : list) {
	62	+ insertToLog(msg.getMsgId());
	63	+ deleteFromDeliver(msg.getMsgId());
	64	+ }
	65	+ }
	66	+}

2477085

b517754

src/main/java/com/munjaon/client/server/service/CollectClientService.java

--- src/main/java/com/munjaon/client/server/service/CollectClientService.java

+++ src/main/java/com/munjaon/client/server/service/CollectClientService.java


 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 import java.nio.channels.SocketChannel;
-import java.nio.file.Files;
 import java.util.List;
 
 public class CollectClientService extends Service {

2477085

b517754

src/main/java/com/munjaon/client/service/DatabaseService.java

--- src/main/java/com/munjaon/client/service/DatabaseService.java

+++ src/main/java/com/munjaon/client/service/DatabaseService.java


 @Getter
 public enum DatabaseService {
     MARIADB_SERVICE,
+    MSSQL_SERVICE,
+    ORACLE_SERVICE,
+    POSTGRESQL_SERVICE,
     MYSQL_SERVICE;
 
     private Object service;

2477085

b517754

src/main/java/com/munjaon/client/service/DatabaseServiceInjector.java

--- src/main/java/com/munjaon/client/service/DatabaseServiceInjector.java

+++ src/main/java/com/munjaon/client/service/DatabaseServiceInjector.java


 package com.munjaon.client.service;
 
 import com.munjaon.client.mariadb.service.MariaDBService;
+import com.munjaon.client.mssql.service.MssqlService;
 import com.munjaon.client.mysql.service.MysqlService;
+import com.munjaon.client.oracle.service.OracleService;
+import com.munjaon.client.postgresql.service.PostgresqlService;
 import jakarta.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

     @Autowired
     private MariaDBService mariaDBService;
     @Autowired
+    private MssqlService mssqlService;
+    @Autowired
     private MysqlService mysqlService;
+    @Autowired
+    private OracleService oracleService;
+    @Autowired
+    private PostgresqlService postgresqlService;
 
     @PostConstruct
     public void postConstruct() {

             switch (svc) {
                 case MARIADB_SERVICE:       svc.setService(mariaDBService);
                     break;
+                case MSSQL_SERVICE:         svc.setService(mssqlService);
+                    break;
                 case MYSQL_SERVICE:         svc.setService(mysqlService);
                     break;
+                case ORACLE_SERVICE:        svc.setService(oracleService);
+                    break;
+                case POSTGRESQL_SERVICE : svc.setService(postgresqlService);
+                    break;
                 default:                    break;
             }
         }

2477085

b517754

src/main/java/com/munjaon/client/service/DatabaseTypeWorker.java

--- src/main/java/com/munjaon/client/service/DatabaseTypeWorker.java

+++ src/main/java/com/munjaon/client/service/DatabaseTypeWorker.java


 
 import com.munjaon.client.mariadb.service.MariaDBService;
 import com.munjaon.client.model.MunjaonMsg;
+import com.munjaon.client.mssql.service.MssqlService;
+import com.munjaon.client.mysql.service.MysqlService;
+import com.munjaon.client.oracle.service.OracleService;
+import com.munjaon.client.postgresql.service.PostgresqlService;
 import lombok.Getter;
 
 import java.util.EnumSet;

             mariaDBService.moveToDeliver();
         }
     },
-    TYPE_OF_MYSQL("MYSQL") {
+    TYPE_OF_ORACLE("ORACLE") {
         @Override
         public boolean checkTableExists() {
-            return false;
+            OracleService oracleService = (OracleService) DatabaseService.ORACLE_SERVICE.getService();
+            return oracleService.checkTableExists();
         }
 
         @Override
         public List<MunjaonMsg> selectToDeliver(String msgType) {
-            return List.of();
+            OracleService oracleService = (OracleService) DatabaseService.ORACLE_SERVICE.getService();
+            return oracleService.selectToDeliver(msgType);
         }
 
         @Override
         public int updateToDeliver(String msgId) {
-            return 0;
+            OracleService oracleService = (OracleService) DatabaseService.ORACLE_SERVICE.getService();
+            return oracleService.updateToDeliver(msgId);
         }
 
         @Override
         public int updateToReport(MunjaonMsg params) {
-            return 0;
+            OracleService oracleService = (OracleService) DatabaseService.ORACLE_SERVICE.getService();
+            return oracleService.updateToReport(params);
         }
 
         @Override
         public List<MunjaonMsg> selectToMove() {
-            return List.of();
+            OracleService oracleService = (OracleService) DatabaseService.ORACLE_SERVICE.getService();
+            return oracleService.selectToMove();
         }
 
         @Override
         public List<MunjaonMsg> selectToExpire(String expireTime) {
-            return List.of();
+            OracleService oracleService = (OracleService) DatabaseService.ORACLE_SERVICE.getService();
+            return oracleService.selectToExpire(expireTime);
         }
 
         @Override
         public int insertToLog(String msgId) {
-            return 0;
+            OracleService oracleService = (OracleService) DatabaseService.ORACLE_SERVICE.getService();
+            return oracleService.insertToLog(msgId);
         }
 
         @Override
         public int deleteFromDeliver(String msgId) {
-            return 0;
+            OracleService oracleService = (OracleService) DatabaseService.ORACLE_SERVICE.getService();
+            return oracleService.deleteFromDeliver(msgId);
         }
 
         @Override
         public void moveToDeliver() {
+            OracleService oracleService = (OracleService) DatabaseService.ORACLE_SERVICE.getService();
+            oracleService.moveToDeliver();
+        }
+    },
+    TYPE_OF_MSSQL("MSSQL") {
+        @Override
+        public boolean checkTableExists() {
+            MssqlService mssqlService = (MssqlService) DatabaseService.MSSQL_SERVICE.getService();
+            return mssqlService.checkTableExists();
+        }
 
+        @Override
+        public List<MunjaonMsg> selectToDeliver(String msgType) {
+            MssqlService mssqlService = (MssqlService) DatabaseService.MSSQL_SERVICE.getService();
+            return mssqlService.selectToDeliver(msgType);
+        }
+
+        @Override
+        public int updateToDeliver(String msgId) {
+            MssqlService mssqlService = (MssqlService) DatabaseService.MSSQL_SERVICE.getService();
+            return mssqlService.updateToDeliver(msgId);
+        }
+
+        @Override
+        public int updateToReport(MunjaonMsg params) {
+            MssqlService mssqlService = (MssqlService) DatabaseService.MSSQL_SERVICE.getService();
+            return mssqlService.updateToReport(params);
+        }
+
+        @Override
+        public List<MunjaonMsg> selectToMove() {
+            MssqlService mssqlService = (MssqlService) DatabaseService.MSSQL_SERVICE.getService();
+            return mssqlService.selectToMove();
+        }
+
+        @Override
+        public List<MunjaonMsg> selectToExpire(String expireTime) {
+            MssqlService mssqlService = (MssqlService) DatabaseService.MSSQL_SERVICE.getService();
+            return mssqlService.selectToExpire(expireTime);
+        }
+
+        @Override
+        public int insertToLog(String msgId) {
+            MssqlService mssqlService = (MssqlService) DatabaseService.MSSQL_SERVICE.getService();
+            return mssqlService.insertToLog(msgId);
+        }
+
+        @Override
+        public int deleteFromDeliver(String msgId) {
+            MssqlService mssqlService = (MssqlService) DatabaseService.ORACLE_SERVICE.getService();
+            return mssqlService.deleteFromDeliver(msgId);
+        }
+
+        @Override
+        public void moveToDeliver() {
+            MssqlService oracleService = (MssqlService) DatabaseService.MSSQL_SERVICE.getService();
+            oracleService.moveToDeliver();
+        }
+    },
+    TYPE_OF_POSTGRESQL("POSTGRESQL") {
+        @Override
+        public boolean checkTableExists() {
+            PostgresqlService postgresqlService = (PostgresqlService) DatabaseService.POSTGRESQL_SERVICE.getService();
+            return postgresqlService.checkTableExists();
+        }
+
+        @Override
+        public List<MunjaonMsg> selectToDeliver(String msgType) {
+            PostgresqlService postgresqlService = (PostgresqlService) DatabaseService.POSTGRESQL_SERVICE.getService();
+            return postgresqlService.selectToDeliver(msgType);
+        }
+
+        @Override
+        public int updateToDeliver(String msgId) {
+            PostgresqlService postgresqlService = (PostgresqlService) DatabaseService.POSTGRESQL_SERVICE.getService();
+            return postgresqlService.updateToDeliver(msgId);
+        }
+
+        @Override
+        public int updateToReport(MunjaonMsg params) {
+            PostgresqlService postgresqlService = (PostgresqlService) DatabaseService.POSTGRESQL_SERVICE.getService();
+            return postgresqlService.updateToReport(params);
+        }
+
+        @Override
+        public List<MunjaonMsg> selectToMove() {
+            PostgresqlService postgresqlService = (PostgresqlService) DatabaseService.POSTGRESQL_SERVICE.getService();
+            return postgresqlService.selectToMove();
+        }
+
+        @Override
+        public List<MunjaonMsg> selectToExpire(String expireTime) {
+            PostgresqlService postgresqlService = (PostgresqlService) DatabaseService.POSTGRESQL_SERVICE.getService();
+            return postgresqlService.selectToExpire(expireTime);
+        }
+
+        @Override
+        public int insertToLog(String msgId) {
+            PostgresqlService postgresqlService = (PostgresqlService) DatabaseService.POSTGRESQL_SERVICE.getService();
+            return postgresqlService.insertToLog(msgId);
+        }
+
+        @Override
+        public int deleteFromDeliver(String msgId) {
+            PostgresqlService postgresqlService = (PostgresqlService) DatabaseService.POSTGRESQL_SERVICE.getService();
+            return postgresqlService.deleteFromDeliver(msgId);
+        }
+
+        @Override
+        public void moveToDeliver() {
+            PostgresqlService postgresqlService = (PostgresqlService) DatabaseService.POSTGRESQL_SERVICE.getService();
+            postgresqlService.moveToDeliver();
+        }
+    },
+    TYPE_OF_MYSQL("MYSQL") {
+        @Override
+        public boolean checkTableExists() {
+            MysqlService mysqlService = (MysqlService) DatabaseService.MYSQL_SERVICE.getService();
+            return mysqlService.checkTableExists();
+        }
+
+        @Override
+        public List<MunjaonMsg> selectToDeliver(String msgType) {
+            MysqlService mysqlService = (MysqlService) DatabaseService.MYSQL_SERVICE.getService();
+            return mysqlService.selectToDeliver(msgType);
+        }
+
+        @Override
+        public int updateToDeliver(String msgId) {
+            MysqlService mysqlService = (MysqlService) DatabaseService.MYSQL_SERVICE.getService();
+            return mysqlService.updateToDeliver(msgId);
+        }
+
+        @Override
+        public int updateToReport(MunjaonMsg params) {
+            MysqlService mysqlService = (MysqlService) DatabaseService.MYSQL_SERVICE.getService();
+            return mysqlService.updateToReport(params);
+        }
+
+        @Override
+        public List<MunjaonMsg> selectToMove() {
+            MysqlService mysqlService = (MysqlService) DatabaseService.MYSQL_SERVICE.getService();
+            return mysqlService.selectToMove();
+        }
+
+        @Override
+        public List<MunjaonMsg> selectToExpire(String expireTime) {
+            MysqlService mysqlService = (MysqlService) DatabaseService.MYSQL_SERVICE.getService();
+            return mysqlService.selectToExpire(expireTime);
+        }
+
+        @Override
+        public int insertToLog(String msgId) {
+            MysqlService mysqlService = (MysqlService) DatabaseService.MYSQL_SERVICE.getService();
+            return mysqlService.insertToLog(msgId);
+        }
+
+        @Override
+        public int deleteFromDeliver(String msgId) {
+            MysqlService mysqlService = (MysqlService) DatabaseService.MYSQL_SERVICE.getService();
+            return mysqlService.deleteFromDeliver(msgId);
+        }
+
+        @Override
+        public void moveToDeliver() {
+            MysqlService mysqlService = (MysqlService) DatabaseService.MYSQL_SERVICE.getService();
+            mysqlService.moveToDeliver();
         }
     };
 

b517754

src/main/resources/sqlmap/mssql/mssql_sql.xml (added)

+++ src/main/resources/sqlmap/mssql/mssql_sql.xml

...	...	@@ -0,0 +1,102 @@
	1	+<?xml version="1.0" encoding="UTF-8"?>
	2	+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
	3	+<mapper namespace="com.munjaon.client.mssql.mapper.MssqlMapper">
	4	+ <select id="checkTime" resultType="String">
	5	+ /* MariaDBMapper.checkTime */
	6	+ SELECT GETDATE()
	7	+ </select>
	8	+ <select id="checkTableForMessage" resultType="int">
	9	+ /* MariaDBMapper.checkTableForMessage */
	10	+-- SELECT 1 FROM MUNJAON_MSG WHERE 1=1 LIMIT 1
	11	+ <![CDATA[
	12	+ SELECT TOP 1 COUNT(MSG_ID) FROM MUNJAON_MSG WHERE 1=1
	13	+ ]]>
	14	+ </select>
	15	+ <select id="checkTableForLog" resultType="int">
	16	+ /* MariaDBMapper.checkTableForLog */
	17	+ <![CDATA[
	18	+ SELECT TOP 1 COUNT(MSG_ID) FROM MUNJAON_MSG_LOG WHERE 1=1
	19	+ ]]>
	20	+ </select>
	21	+ <select id="selectToDeliver" resultType="com.munjaon.client.model.MunjaonMsg">
	22	+ /* MariaDBMapper.selectToDeliver */
	23	+ <![CDATA[
	24	+ SELECT
	25	+ TOP 100
	26	+ MSG_ID
	27	+ , MSG_TYPE
	28	+ , REPLACE(REPLACE(REPLACE(CONVERT(VARCHAR(20),REQUEST_DATE,120),'-',''),' ',''),':','') RESERVE_DATE
	29	+ , REPLACE(REPLACE(REPLACE(CONVERT(VARCHAR(20),GETDATE(),120),'-',''),' ',''),':','') REQUEST_DATE
	30	+ , RECV_PHONE
	31	+ , SEND_PHONE
	32	+ , SUBJECT
	33	+ , MESSAGE
	34	+ , FILENAME01
	35	+ , FILENAME02
	36	+ , FILENAME03
	37	+ , KAKAO_SENDER_KEY
	38	+ , KAKAO_TEMPLATE_CODE
	39	+ , KAKAO_JSON_FILE
	40	+ FROM MUNJAON_MSG
	41	+ WHERE SEND_STATUS = '0'
	42	+ AND MSG_TYPE = #{msgType}
	43	+ AND REQUEST_DATE <= GETDATE()
	44	+ ORDER BY REQUEST_DATE ASC
	45	+ ]]>
	46	+ </select>
	47	+ <update id="updateToDeliver">
	48	+ /* MariaDBMapper.updateToDeliver */
	49	+ UPDATE MUNJAON_MSG SET
	50	+ SEND_STATUS = '1'
	51	+ , DELIVER_DATE = GETDATE()
	52	+ WHERE MSG_ID = #{msgId}
	53	+ </update>
	54	+ <update id="updateToReport">
	55	+ /* MariaDBMapper.updateToReport */
	56	+ UPDATE MUNJAON_MSG SET
	57	+ SEND_STATUS = #{sendStatus}
	58	+ , SENT_DATE = CAST(#{sendDate} AS DATETIME)
	59	+ , REPORT_DATE = SYSDATE
	60	+ , TELECOM = #{telecom}
	61	+ WHERE MSG_ID = #{msgId}
	62	+ </update>
	63	+ <select id="selectToMove" resultType="com.munjaon.client.model.MunjaonMsg">
	64	+ /* MariaDBMapper.selectToMove */
	65	+ <![CDATA[
	66	+ SELECT TOP 100
	67	+ MSG_ID, CONVERT(VARCHAR(6),REQUEST_DATE,112) REQUEST_DATE
	68	+ FROM MUNJAON_MSG
	69	+ WHERE SEND_STATUS NOT IN ('0', '1')
	70	+ ]]>
	71	+ </select>
	72	+ <select id="selectToExpire" resultType="com.munjaon.client.model.MunjaonMsg">
	73	+ /* MariaDBMapper.selectToExpire */
	74	+ <![CDATA[
	75	+ SELECT TOP 100
	76	+ MSG_ID, CONVERT(VARCHAR(6),REQUEST_DATE,112) REQUEST_DATE
	77	+ FROM MUNJAON_MSG
	78	+ WHERE REQUEST_DATE < CAST(#{expireTime} AS DATETIME)
	79	+ AND SEND_STATUS = '1'
	80	+ ]]>
	81	+ </select>
	82	+ <insert id="insertToLog">
	83	+ /* MariaDBMapper.insertToLog */
	84	+ INSERT INTO MUNJAON_MSG_LOG
	85	+ (
	86	+ MSG_ID, MSG_TYPE, SEND_STATUS, REQUEST_DATE,
	87	+ RECV_PHONE, SEND_PHONE, SUBJECT, MESSAGE, TELECOM,
	88	+ FILENAME01, FILENAME02, FILENAME03, DELIVER_DATE, SENT_DATE, REPORT_DATE
	89	+ )
	90	+ SELECT
	91	+ MSG_ID, MSG_TYPE, SEND_STATUS, REQUEST_DATE,
	92	+ RECV_PHONE, SEND_PHONE, SUBJECT, MESSAGE, TELECOM,
	93	+ FILENAME01, FILENAME02, FILENAME03, DELIVER_DATE, SENT_DATE, REPORT_DATE
	94	+ FROM MUNJAON_MSG
	95	+ WHERE MSG_ID = #{msgId}
	96	+ </insert>
	97	+ <delete id="deleteFromDeliver">
	98	+ /* MariaDBMapper.deleteFromDeliver */
	99	+ DELETE FROM MUNJAON_MSG
	100	+ WHERE MSG_ID = #{msgId}
	101	+ </delete>
	102	+</mapper>(No newline at end of file)

b517754

src/main/resources/sqlmap/mysql/mysql_sql.xml (added)

+++ src/main/resources/sqlmap/mysql/mysql_sql.xml

...	...	@@ -0,0 +1,97 @@
	1	+<?xml version="1.0" encoding="UTF-8"?>
	2	+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
	3	+<mapper namespace="com.munjaon.client.mysql.mapper.MysqlMapper">
	4	+ <select id="checkTime" resultType="String">
	5	+ /* MariaDBMapper.checkTime */
	6	+ SELECT DATE_FORMAT(NOW(), '%Y%m%d%H%i%s')
	7	+ </select>
	8	+ <select id="checkTableForMessage" resultType="int">
	9	+ /* MariaDBMapper.checkTableForMessage */
	10	+-- SELECT 1 FROM MUNJAON_MSG WHERE 1=1 LIMIT 1
	11	+ SELECT COUNT(*)
	12	+ FROM information_schema.tables
	13	+ WHERE TABLE_NAME = 'MUNJAON_MSG'
	14	+ </select>
	15	+ <select id="checkTableForLog" resultType="int">
	16	+ /* MariaDBMapper.checkTableForLog */
	17	+ SELECT COUNT(*)
	18	+ FROM information_schema.tables
	19	+ WHERE TABLE_NAME = 'MUNJAON_MSG_LOG'
	20	+-- SELECT 1 FROM MUNJAON_MSG_LOG WHERE 1=1 LIMIT 1
	21	+ </select>
	22	+ <select id="selectToDeliver" resultType="com.munjaon.client.model.MunjaonMsg">
	23	+ /* MariaDBMapper.selectToDeliver */
	24	+ SELECT
	25	+ MSG_ID
	26	+ , MSG_TYPE
	27	+ , DATE_FORMAT(REQUEST_DATE,'%Y%m%d%H%i%s') RESERVE_DATE
	28	+ , DATE_FORMAT(NOW(),'%Y%m%d%H%i%s') REQUEST_DATE
	29	+ , RECV_PHONE
	30	+ , SEND_PHONE
	31	+ , SUBJECT
	32	+ , MESSAGE
	33	+ , FILENAME01
	34	+ , FILENAME02
	35	+ , FILENAME03
	36	+ , KAKAO_SENDER_KEY
	37	+ , KAKAO_TEMPLATE_CODE
	38	+ , KAKAO_JSON_FILE
	39	+ FROM MUNJAON_MSG
	40	+ WHERE SEND_STATUS = '0'
	41	+ AND MSG_TYPE = #{msgType}
	42	+ AND REQUEST_DATE <![CDATA[<=]]> SYSDATE()
	43	+ ORDER BY REQUEST_DATE ASC
	44	+ LIMIT 100
	45	+ </select>
	46	+ <update id="updateToDeliver">
	47	+ /* MariaDBMapper.updateToDeliver */
	48	+ UPDATE MUNJAON_MSG SET
	49	+ SEND_STATUS = '1'
	50	+ , DELIVER_DATE = NOW()
	51	+ WHERE MSG_ID = #{msgId}
	52	+ </update>
	53	+ <update id="updateToReport">
	54	+ /* MariaDBMapper.updateToReport */
	55	+ UPDATE MUNJAON_MSG SET
	56	+ SEND_STATUS = #{sendStatus}
	57	+ , SENT_DATE = FROM_UNIXTIME(UNIX_TIMESTAMP(#{sendDate}))
	58	+ , REPORT_DATE = NOW()
	59	+ , TELECOM = #{telecom}
	60	+ WHERE MSG_ID = #{msgId}
	61	+ </update>
	62	+ <select id="selectToMove" resultType="com.munjaon.client.model.MunjaonMsg">
	63	+ /* MariaDBMapper.selectToMove */
	64	+ SELECT MSG_ID, DATE_FORMAT(REQUEST_DATE, '%Y%m') REQUEST_DATE
	65	+ FROM MUNJAON_MSG
	66	+ WHERE SEND_STATUS NOT IN ('0', '1')
	67	+ LIMIT 100
	68	+ </select>
	69	+ <select id="selectToExpire" resultType="com.munjaon.client.model.MunjaonMsg">
	70	+ /* MariaDBMapper.selectToExpire */
	71	+ SELECT MSG_ID, DATE_FORMAT(REQUEST_DATE, '%Y%m') REQUEST_DATE
	72	+ FROM MUNJAON_MSG
	73	+ WHERE REQUEST_DATE <![CDATA[<]]> FROM_UNIXTIME(UNIX_TIMESTAMP(#{expireTime}))
	74	+ AND SEND_STATUS = '1'
	75	+ LIMIT 100
	76	+ </select>
	77	+ <insert id="insertToLog">
	78	+ /* MariaDBMapper.insertToLog */
	79	+ INSERT INTO MUNJAON_MSG_LOG
	80	+ (
	81	+ MSG_ID, MSG_TYPE, SEND_STATUS, REQUEST_DATE,
	82	+ RECV_PHONE, SEND_PHONE, SUBJECT, MESSAGE, TELECOM,
	83	+ FILENAME01, FILENAME02, FILENAME03, DELIVER_DATE, SENT_DATE, REPORT_DATE
	84	+ )
	85	+ SELECT
	86	+ MSG_ID, MSG_TYPE, SEND_STATUS, REQUEST_DATE,
	87	+ RECV_PHONE, SEND_PHONE, SUBJECT, MESSAGE, TELECOM,
	88	+ FILENAME01, FILENAME02, FILENAME03, DELIVER_DATE, SENT_DATE, REPORT_DATE
	89	+ FROM MUNJAON_MSG
	90	+ WHERE MSG_ID = #{msgId}
	91	+ </insert>
	92	+ <delete id="deleteFromDeliver">
	93	+ /* MariaDBMapper.deleteFromDeliver */
	94	+ DELETE FROM MUNJAON_MSG
	95	+ WHERE MSG_ID = #{msgId}
	96	+ </delete>
	97	+</mapper>(No newline at end of file)

b517754

src/main/resources/sqlmap/oracle/oracle_sql.xml (added)

+++ src/main/resources/sqlmap/oracle/oracle_sql.xml

...	...	@@ -0,0 +1,102 @@
	1	+<?xml version="1.0" encoding="UTF-8"?>
	2	+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
	3	+<mapper namespace="com.munjaon.client.oracle.mapper.OracleMapper">
	4	+ <select id="checkTime" resultType="String">
	5	+ /* MariaDBMapper.checkTime */
	6	+ SELECT TO_CHAR(SYSDATE, 'YYYYMMDDHH24MISS') FROM DUAL
	7	+ </select>
	8	+ <select id="checkTableForMessage" resultType="int">
	9	+ /* MariaDBMapper.checkTableForMessage */
	10	+-- SELECT 1 FROM MUNJAON_MSG WHERE 1=1 LIMIT 1
	11	+ <![CDATA[
	12	+ SELECT COUNT(MSG_ID) FROM MUNJAON_MSG WHERE 1=1 AND rownum <= 1
	13	+ ]]>
	14	+ </select>
	15	+ <select id="checkTableForLog" resultType="int">
	16	+ /* MariaDBMapper.checkTableForLog */
	17	+ <![CDATA[
	18	+ SELECT COUNT(MSG_ID) FROM MUNJAON_MSG_LOG WHERE 1=1 AND rownum <= 1
	19	+ ]]>
	20	+ </select>
	21	+ <select id="selectToDeliver" resultType="com.munjaon.client.model.MunjaonMsg">
	22	+ /* MariaDBMapper.selectToDeliver */
	23	+ <![CDATA[
	24	+ SELECT
	25	+ MSG_ID
	26	+ , MSG_TYPE
	27	+ , TO_CHAR(REQUEST_DATE,'YYYYMMDDHH24MISS') RESERVE_DATE
	28	+ , TO_CHAR(SYSDATE,'YYYYMMDDHH24MISS') REQUEST_DATE
	29	+ , RECV_PHONE
	30	+ , SEND_PHONE
	31	+ , SUBJECT
	32	+ , MESSAGE
	33	+ , FILENAME01
	34	+ , FILENAME02
	35	+ , FILENAME03
	36	+ , KAKAO_SENDER_KEY
	37	+ , KAKAO_TEMPLATE_CODE
	38	+ , KAKAO_JSON_FILE
	39	+ FROM MUNJAON_MSG
	40	+ WHERE SEND_STATUS = '0'
	41	+ AND MSG_TYPE = #{msgType}
	42	+ AND REQUEST_DATE <= SYSDATE
	43	+ AND ROWNUM <= 100
	44	+ ORDER BY REQUEST_DATE ASC
	45	+ ]]>
	46	+ </select>
	47	+ <update id="updateToDeliver">
	48	+ /* MariaDBMapper.updateToDeliver */
	49	+ UPDATE MUNJAON_MSG SET
	50	+ SEND_STATUS = '1'
	51	+ , DELIVER_DATE = SYSDATE
	52	+ WHERE MSG_ID = #{msgId}
	53	+ </update>
	54	+ <update id="updateToReport">
	55	+ /* MariaDBMapper.updateToReport */
	56	+ UPDATE MUNJAON_MSG SET
	57	+ SEND_STATUS = #{sendStatus}
	58	+ , SENT_DATE = TO_DATE(#{sendDate}, 'YYYYMMDDHH24MISS')
	59	+ , REPORT_DATE = SYSDATE
	60	+ , TELECOM = #{telecom}
	61	+ WHERE MSG_ID = #{msgId}
	62	+ </update>
	63	+ <select id="selectToMove" resultType="com.munjaon.client.model.MunjaonMsg">
	64	+ /* MariaDBMapper.selectToMove */
	65	+ <![CDATA[
	66	+ SELECT MSG_ID, TO_CHAR(REQUEST_DATE, 'YYYYMM') REQUEST_DATE
	67	+ FROM MUNJAON_MSG
	68	+ WHERE SEND_STATUS NOT IN ('0', '1')
	69	+ AND ROWNUM <= 100
	70	+ ]]>
	71	+ </select>
	72	+ <select id="selectToExpire" resultType="com.munjaon.client.model.MunjaonMsg">
	73	+ /* MariaDBMapper.selectToExpire */
	74	+ <![CDATA[
	75	+ SELECT MSG_ID, TO_CHAR(REQUEST_DATE, 'YYYYMM') REQUEST_DATE
	76	+ FROM MUNJAON_MSG
	77	+ WHERE REQUEST_DATE < TO_DATE(#{expireTime}, 'YYYYMMDDHH24MISS')
	78	+ AND SEND_STATUS = '1'
	79	+ AND ROWNUM <= 100
	80	+ ]]>
	81	+ </select>
	82	+ <insert id="insertToLog">
	83	+ /* MariaDBMapper.insertToLog */
	84	+ INSERT INTO MUNJAON_MSG_LOG
	85	+ (
	86	+ MSG_ID, MSG_TYPE, SEND_STATUS, REQUEST_DATE,
	87	+ RECV_PHONE, SEND_PHONE, SUBJECT, MESSAGE, TELECOM,
	88	+ FILENAME01, FILENAME02, FILENAME03, DELIVER_DATE, SENT_DATE, REPORT_DATE
	89	+ )
	90	+ SELECT
	91	+ MSG_ID, MSG_TYPE, SEND_STATUS, REQUEST_DATE,
	92	+ RECV_PHONE, SEND_PHONE, SUBJECT, MESSAGE, TELECOM,
	93	+ FILENAME01, FILENAME02, FILENAME03, DELIVER_DATE, SENT_DATE, REPORT_DATE
	94	+ FROM MUNJAON_MSG
	95	+ WHERE MSG_ID = #{msgId}
	96	+ </insert>
	97	+ <delete id="deleteFromDeliver">
	98	+ /* MariaDBMapper.deleteFromDeliver */
	99	+ DELETE FROM MUNJAON_MSG
	100	+ WHERE MSG_ID = #{msgId}
	101	+ </delete>
	102	+</mapper>(No newline at end of file)

b517754

src/main/resources/sqlmap/postgresql/postresql_sql.xml (added)

+++ src/main/resources/sqlmap/postgresql/postresql_sql.xml

...	...	@@ -0,0 +1,97 @@
	1	+<?xml version="1.0" encoding="UTF-8"?>
	2	+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
	3	+<mapper namespace="com.munjaon.client.postgresql.mapper.PostgresqlMapper">
	4	+ <select id="checkTime" resultType="String">
	5	+ /* MariaDBMapper.checkTime */
	6	+ SELECT TO_CHAR(NOW(), 'YYYYMMDDHH24MISS') FROM DUAL
	7	+ </select>
	8	+ <select id="checkTableForMessage" resultType="int">
	9	+ /* MariaDBMapper.checkTableForMessage */
	10	+ SELECT COUNT(MSG_ID) FROM MUNJAON_MSG WHERE 1=1 LIMIT 1
	11	+ </select>
	12	+ <select id="checkTableForLog" resultType="int">
	13	+ /* MariaDBMapper.checkTableForLog */
	14	+ SELECT COUNT(MSG_ID) FROM MUNJAON_MSG_LOG WHERE 1=1 LIMIT 1
	15	+ </select>
	16	+ <select id="selectToDeliver" resultType="com.munjaon.client.model.MunjaonMsg">
	17	+ /* MariaDBMapper.selectToDeliver */
	18	+ <![CDATA[
	19	+ SELECT
	20	+ MSG_ID
	21	+ , MSG_TYPE
	22	+ , TO_CHAR(REQUEST_DATE,'YYYYMMDDHH24MISS') RESERVE_DATE
	23	+ , TO_CHAR(NOW(),'YYYYMMDDHH24MISS') REQUEST_DATE
	24	+ , RECV_PHONE
	25	+ , SEND_PHONE
	26	+ , SUBJECT
	27	+ , MESSAGE
	28	+ , FILENAME01
	29	+ , FILENAME02
	30	+ , FILENAME03
	31	+ , KAKAO_SENDER_KEY
	32	+ , KAKAO_TEMPLATE_CODE
	33	+ , KAKAO_JSON_FILE
	34	+ FROM MUNJAON_MSG
	35	+ WHERE SEND_STATUS = '0'
	36	+ AND MSG_TYPE = #{msgType}
	37	+ AND REQUEST_DATE <= NOW()
	38	+ ORDER BY REQUEST_DATE ASC
	39	+ LIMIT 100
	40	+ ]]>
	41	+ </select>
	42	+ <update id="updateToDeliver">
	43	+ /* MariaDBMapper.updateToDeliver */
	44	+ UPDATE MUNJAON_MSG SET
	45	+ SEND_STATUS = '1'
	46	+ , DELIVER_DATE = NOW()
	47	+ WHERE MSG_ID = #{msgId}
	48	+ </update>
	49	+ <update id="updateToReport">
	50	+ /* MariaDBMapper.updateToReport */
	51	+ UPDATE MUNJAON_MSG SET
	52	+ SEND_STATUS = #{sendStatus}
	53	+ , SENT_DATE = TO_DATE(#{sendDate}, 'YYYYMMDDHH24MISS')
	54	+ , REPORT_DATE = SYSDATE
	55	+ , TELECOM = #{telecom}
	56	+ WHERE MSG_ID = #{msgId}
	57	+ </update>
	58	+ <select id="selectToMove" resultType="com.munjaon.client.model.MunjaonMsg">
	59	+ /* MariaDBMapper.selectToMove */
	60	+ <![CDATA[
	61	+ SELECT MSG_ID, TO_CHAR(REQUEST_DATE, 'YYYYMM') REQUEST_DATE
	62	+ FROM MUNJAON_MSG
	63	+ WHERE SEND_STATUS NOT IN ('0', '1')
	64	+ LIMIT 100
	65	+ ]]>
	66	+ </select>
	67	+ <select id="selectToExpire" resultType="com.munjaon.client.model.MunjaonMsg">
	68	+ /* MariaDBMapper.selectToExpire */
	69	+ <![CDATA[
	70	+ SELECT MSG_ID, TO_CHAR(REQUEST_DATE, 'YYYYMM') REQUEST_DATE
	71	+ FROM MUNJAON_MSG
	72	+ WHERE REQUEST_DATE < TO_DATE(#{expireTime}, 'YYYYMMDDHH24MISS')
	73	+ AND SEND_STATUS = '1'
	74	+ LIMIT 100
	75	+ ]]>
	76	+ </select>
	77	+ <insert id="insertToLog">
	78	+ /* MariaDBMapper.insertToLog */
	79	+ INSERT INTO MUNJAON_MSG_LOG
	80	+ (
	81	+ MSG_ID, MSG_TYPE, SEND_STATUS, REQUEST_DATE,
	82	+ RECV_PHONE, SEND_PHONE, SUBJECT, MESSAGE, TELECOM,
	83	+ FILENAME01, FILENAME02, FILENAME03, DELIVER_DATE, SENT_DATE, REPORT_DATE
	84	+ )
	85	+ SELECT
	86	+ MSG_ID, MSG_TYPE, SEND_STATUS, REQUEST_DATE,
	87	+ RECV_PHONE, SEND_PHONE, SUBJECT, MESSAGE, TELECOM,
	88	+ FILENAME01, FILENAME02, FILENAME03, DELIVER_DATE, SENT_DATE, REPORT_DATE
	89	+ FROM MUNJAON_MSG
	90	+ WHERE MSG_ID = #{msgId}
	91	+ </insert>
	92	+ <delete id="deleteFromDeliver">
	93	+ /* MariaDBMapper.deleteFromDeliver */
	94	+ DELETE FROM MUNJAON_MSG
	95	+ WHERE MSG_ID = #{msgId}
	96	+ </delete>
	97	+</mapper>(No newline at end of file)

2477085

src/test/java/com/munjaon/client/MunjaonClientApplicationTests.java (deleted)

--- src/test/java/com/munjaon/client/MunjaonClientApplicationTests.java

...	...	@@ -1,13 +0,0 @@
	1	-package com.munjaon.client;
	2	-
	3	-import org.junit.jupiter.api.Test;
	4	-import org.springframework.boot.test.context.SpringBootTest;
	5	-
	6	-@SpringBootTest
	7	-class MunjaonClientApplicationTests {
	8	-
	9	- @Test
	10	- void contextLoads() {
	11	- }
	12	-
	13	-}

Add a comment

Open 0
Closed 0

List

...	...	@@ -43,6 +43,13 @@
43	43	implementation 'org.jdom:jdom2:2.0.6.1'
44	44	// https://mvnrepository.com/artifact/org.apache.commons/commons-configuration2
45	45	implementation 'org.apache.commons:commons-configuration2:2.10.1'
	46	+ // https://mvnrepository.com/artifact/com.oracle.database.jdbc/ojdbc11
	47	+ implementation group: 'com.oracle.database.jdbc', name: 'ojdbc11', version: '23.5.0.24.07'
	48	+ // https://mvnrepository.com/artifact/com.microsoft.sqlserver/mssql-jdbc
	49	+ implementation group: 'com.microsoft.sqlserver', name: 'mssql-jdbc', version: '12.8.0.jre11'
	50	+ // https://mvnrepository.com/artifact/org.postgresql/postgresql
	51	+ implementation group: 'org.postgresql', name: 'postgresql', version: '42.7.3'
	52	+
46	53	}
47	54
48	55	tasks.named('test') {

...	...	@@ -1,7 +1,6 @@
1	1	package com.munjaon.client.config;
2	2
3	3	import com.zaxxer.hikari.HikariDataSource;
4		-import lombok.Getter;
5	4	import lombok.RequiredArgsConstructor;
6	5	import lombok.extern.slf4j.Slf4j;
7	6	import org.apache.commons.configuration2.ex.ConfigurationException;
...	...	@@ -11,7 +10,6 @@
11	10	import org.mybatis.spring.annotation.MapperScan;
12	11	import org.mybatis.spring.boot.autoconfigure.SpringBootVFS;
13	12	import org.springframework.beans.factory.annotation.Autowired;
14		-import org.springframework.boot.context.properties.ConfigurationProperties;
15	13	import org.springframework.boot.jdbc.DataSourceBuilder;
16	14	import org.springframework.context.ApplicationContext;
17	15	import org.springframework.context.annotation.Bean;
...	...	@@ -28,6 +26,7 @@
28	26	@EnableTransactionManagement
29	27	@MapperScan(basePackages= "com.munjaon.client.**.mapper")
30	28	public class DataSourceConfig {
	29	+ //public class DataSourceConfig implements BeanDefinitionRegistryPostProcessor {
31	30	@Autowired
32	31	private ApplicationContext applicationContext;
33	32	private final ServerConfig serverConfig;
...	...	@@ -51,12 +50,15 @@
51	50	@Primary
52	51	@Bean(name = "factory")
53	52	public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception {
	53	+ String dbms = serverConfig.getString("DB.DBMS");
	54	+ System.out.println("dbms : " + dbms);
54	55	SqlSessionFactoryBean sqlSessionFactory = new SqlSessionFactoryBean();
55	56	sqlSessionFactory.setVfs(SpringBootVFS.class);
56	57	sqlSessionFactory.setDataSource(dataSource);
57	58	sqlSessionFactory.setTypeAliasesPackage("com.munjaon.client.**.dto");
58	59	sqlSessionFactory.setConfigLocation(applicationContext.getResource("classpath:mybatis-config.xml"));
59	60	sqlSessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:/sqlmap/*/.xml"));
	61	+// sqlSessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:/sqlmap/" + dbms.toLowerCase() + "/*.xml"));
60	62	return sqlSessionFactory.getObject();
61	63	}
62	64
...	...	@@ -65,4 +67,22 @@
65	67	public SqlSessionTemplate sqlSession(SqlSessionFactory sqlSessionFactory) {
66	68	return new SqlSessionTemplate(sqlSessionFactory);
67	69	}
	70	+
	71	+// @Override
	72	+// public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
	73	+// String dbms = null;
	74	+// try {
	75	+// dbms = serverConfig.getString("DB.DBMS");
	76	+// } catch (ConfigurationException e) {
	77	+// throw new RuntimeException(e);
	78	+// }
	79	+// AbstractBeanDefinition mapperScannerConfigurer = BeanDefinitionBuilder
	80	+// .genericBeanDefinition(MapperScannerConfigurer.class)
	81	+// .addPropertyValue("sqlSessionFactoryBeanName", "factory")
	82	+// .addPropertyValue("basePackage", "com.munjaon.client.**.dto")
	83	+// .addPropertyValue("annotationClass", MapperType.value(dbms).getClass())
	84	+// .getBeanDefinition();
	85	+//
	86	+// registry.registerBeanDefinition("MapperScanner", mapperScannerConfigurer);
	87	+// }
68	88	}

...	...	@@ -13,14 +13,14 @@
13	13	@Service
14	14	@RequiredArgsConstructor
15	15	public class MariaDBService {
16		- private final MariaDBMapper mariaDBMapper;
	16	+ private final MariaDBMapper deliverBMapper;
17	17
18	18	public boolean checkTableExists() {
19	19	boolean isExist = false;
20	20	try {
21		- int msgCount = mariaDBMapper.checkTableForMessage();
22		- int logCount = mariaDBMapper.checkTableForLog();
23		- if (msgCount > 0 && logCount > 0) {
	21	+ int msgCount = deliverBMapper.checkTableForMessage();
	22	+ int logCount = deliverBMapper.checkTableForLog();
	23	+ if (msgCount >= 0 && logCount >= 0) {
24	24	isExist = true;
25	25	}
26	26	} catch (Exception e) {
...	...	@@ -30,25 +30,25 @@
30	30	return isExist;
31	31	}
32	32	public List<MunjaonMsg> selectToDeliver(String msgType) {
33		- return mariaDBMapper.selectToDeliver(msgType);
	33	+ return deliverBMapper.selectToDeliver(msgType);
34	34	}
35	35	public int updateToDeliver(String msgId) {
36		- return mariaDBMapper.updateToDeliver(msgId);
	36	+ return deliverBMapper.updateToDeliver(msgId);
37	37	}
38	38	public int updateToReport(MunjaonMsg params) {
39		- return mariaDBMapper.updateToReport(params);
	39	+ return deliverBMapper.updateToReport(params);
40	40	}
41	41	public List<MunjaonMsg> selectToMove() {
42		- return mariaDBMapper.selectToMove();
	42	+ return deliverBMapper.selectToMove();
43	43	}
44	44	public List<MunjaonMsg> selectToExpire(String expireTime) {
45		- return mariaDBMapper.selectToExpire(expireTime);
	45	+ return deliverBMapper.selectToExpire(expireTime);
46	46	}
47	47	public int insertToLog(String msgId) {
48		- return mariaDBMapper.insertToLog(msgId);
	48	+ return deliverBMapper.insertToLog(msgId);
49	49	}
50	50	public int deleteFromDeliver(String msgId) {
51		- return mariaDBMapper.deleteFromDeliver(msgId);
	51	+ return deliverBMapper.deleteFromDeliver(msgId);
52	52	}
53	53
54	54	@Transactional

...	...	@@ -1,11 +1,66 @@
1	1	package com.munjaon.client.mysql.service;
2	2
	3	+import com.munjaon.client.model.MunjaonMsg;
	4	+import com.munjaon.client.mysql.mapper.MysqlMapper;
3	5	import lombok.RequiredArgsConstructor;
4	6	import lombok.extern.slf4j.Slf4j;
5	7	import org.springframework.stereotype.Service;
	8	+import org.springframework.transaction.annotation.Transactional;
	9	+
	10	+import java.util.List;
6	11
7	12	@Slf4j
8	13	@Service
9	14	@RequiredArgsConstructor
10	15	public class MysqlService {
	16	+ private final MysqlMapper deliverBMapper;
	17	+
	18	+ public boolean checkTableExists() {
	19	+ boolean isExist = false;
	20	+ try {
	21	+ int msgCount = deliverBMapper.checkTableForMessage();
	22	+ int logCount = deliverBMapper.checkTableForLog();
	23	+ if (msgCount >= 0 && logCount >= 0) {
	24	+ isExist = true;
	25	+ }
	26	+ } catch (Exception e) {
	27	+ log.error("Check table exists error : {}", e);
	28	+ }
	29	+
	30	+ return isExist;
	31	+ }
	32	+ public List<MunjaonMsg> selectToDeliver(String msgType) {
	33	+ return deliverBMapper.selectToDeliver(msgType);
	34	+ }
	35	+ public int updateToDeliver(String msgId) {
	36	+ return deliverBMapper.updateToDeliver(msgId);
	37	+ }
	38	+ public int updateToReport(MunjaonMsg params) {
	39	+ return deliverBMapper.updateToReport(params);
	40	+ }
	41	+ public List<MunjaonMsg> selectToMove() {
	42	+ return deliverBMapper.selectToMove();
	43	+ }
	44	+ public List<MunjaonMsg> selectToExpire(String expireTime) {
	45	+ return deliverBMapper.selectToExpire(expireTime);
	46	+ }
	47	+ public int insertToLog(String msgId) {
	48	+ return deliverBMapper.insertToLog(msgId);
	49	+ }
	50	+ public int deleteFromDeliver(String msgId) {
	51	+ return deliverBMapper.deleteFromDeliver(msgId);
	52	+ }
	53	+
	54	+ @Transactional
	55	+ public void moveToDeliver() {
	56	+ List<MunjaonMsg> list = selectToMove();
	57	+ if (list == null \|\| list.size() == 0) {
	58	+ return;
	59	+ }
	60	+ log.debug("[CLASS : {} : MOVE_COUNT : {}", this.getClass(), list.size());
	61	+ for (MunjaonMsg msg : list) {
	62	+ insertToLog(msg.getMsgId());
	63	+ deleteFromDeliver(msg.getMsgId());
	64	+ }
	65	+ }
11	66	}

...	...	@@ -13,7 +13,6 @@
13	13	import java.net.InetSocketAddress;
14	14	import java.nio.ByteBuffer;
15	15	import java.nio.channels.SocketChannel;
16		-import java.nio.file.Files;
17	16	import java.util.List;
18	17
19	18	public class CollectClientService extends Service {

...	...	@@ -5,6 +5,9 @@
5	5	@Getter
6	6	public enum DatabaseService {
7	7	MARIADB_SERVICE,
	8	+ MSSQL_SERVICE,
	9	+ ORACLE_SERVICE,
	10	+ POSTGRESQL_SERVICE,
8	11	MYSQL_SERVICE;
9	12
10	13	private Object service;

...	...	@@ -1,7 +1,10 @@
1	1	package com.munjaon.client.service;
2	2
3	3	import com.munjaon.client.mariadb.service.MariaDBService;
	4	+import com.munjaon.client.mssql.service.MssqlService;
4	5	import com.munjaon.client.mysql.service.MysqlService;
	6	+import com.munjaon.client.oracle.service.OracleService;
	7	+import com.munjaon.client.postgresql.service.PostgresqlService;
5	8	import jakarta.annotation.PostConstruct;
6	9	import org.springframework.beans.factory.annotation.Autowired;
7	10	import org.springframework.stereotype.Component;
...	...	@@ -13,7 +16,13 @@
13	16	@Autowired
14	17	private MariaDBService mariaDBService;
15	18	@Autowired
	19	+ private MssqlService mssqlService;
	20	+ @Autowired
16	21	private MysqlService mysqlService;
	22	+ @Autowired
	23	+ private OracleService oracleService;
	24	+ @Autowired
	25	+ private PostgresqlService postgresqlService;
17	26
18	27	@PostConstruct
19	28	public void postConstruct() {
...	...	@@ -21,8 +30,14 @@
21	30	switch (svc) {
22	31	case MARIADB_SERVICE: svc.setService(mariaDBService);
23	32	break;
	33	+ case MSSQL_SERVICE: svc.setService(mssqlService);
	34	+ break;
24	35	case MYSQL_SERVICE: svc.setService(mysqlService);
25	36	break;
	37	+ case ORACLE_SERVICE: svc.setService(oracleService);
	38	+ break;
	39	+ case POSTGRESQL_SERVICE : svc.setService(postgresqlService);
	40	+ break;
26	41	default: break;
27	42	}
28	43	}

...	...	@@ -2,6 +2,10 @@
2	2
3	3	import com.munjaon.client.mariadb.service.MariaDBService;
4	4	import com.munjaon.client.model.MunjaonMsg;
	5	+import com.munjaon.client.mssql.service.MssqlService;
	6	+import com.munjaon.client.mysql.service.MysqlService;
	7	+import com.munjaon.client.oracle.service.OracleService;
	8	+import com.munjaon.client.postgresql.service.PostgresqlService;
5	9	import lombok.Getter;
6	10
7	11	import java.util.EnumSet;
...	...	@@ -64,50 +68,224 @@
64	68	mariaDBService.moveToDeliver();
65	69	}
66	70	},
67		- TYPE_OF_MYSQL("MYSQL") {
	71	+ TYPE_OF_ORACLE("ORACLE") {
68	72	@Override
69	73	public boolean checkTableExists() {
70		- return false;
	74	+ OracleService oracleService = (OracleService) DatabaseService.ORACLE_SERVICE.getService();
	75	+ return oracleService.checkTableExists();
71	76	}
72	77
73	78	@Override
74	79	public List<MunjaonMsg> selectToDeliver(String msgType) {
75		- return List.of();
	80	+ OracleService oracleService = (OracleService) DatabaseService.ORACLE_SERVICE.getService();
	81	+ return oracleService.selectToDeliver(msgType);
76	82	}
77	83
78	84	@Override
79	85	public int updateToDeliver(String msgId) {
80		- return 0;
	86	+ OracleService oracleService = (OracleService) DatabaseService.ORACLE_SERVICE.getService();
	87	+ return oracleService.updateToDeliver(msgId);
81	88	}
82	89
83	90	@Override
84	91	public int updateToReport(MunjaonMsg params) {
85		- return 0;
	92	+ OracleService oracleService = (OracleService) DatabaseService.ORACLE_SERVICE.getService();
	93	+ return oracleService.updateToReport(params);
86	94	}
87	95
88	96	@Override
89	97	public List<MunjaonMsg> selectToMove() {
90		- return List.of();
	98	+ OracleService oracleService = (OracleService) DatabaseService.ORACLE_SERVICE.getService();
	99	+ return oracleService.selectToMove();
91	100	}
92	101
93	102	@Override
94	103	public List<MunjaonMsg> selectToExpire(String expireTime) {
95		- return List.of();
	104	+ OracleService oracleService = (OracleService) DatabaseService.ORACLE_SERVICE.getService();
	105	+ return oracleService.selectToExpire(expireTime);
96	106	}
97	107
98	108	@Override
99	109	public int insertToLog(String msgId) {
100		- return 0;
	110	+ OracleService oracleService = (OracleService) DatabaseService.ORACLE_SERVICE.getService();
	111	+ return oracleService.insertToLog(msgId);
101	112	}
102	113
103	114	@Override
104	115	public int deleteFromDeliver(String msgId) {
105		- return 0;
	116	+ OracleService oracleService = (OracleService) DatabaseService.ORACLE_SERVICE.getService();
	117	+ return oracleService.deleteFromDeliver(msgId);
106	118	}
107	119
108	120	@Override
109	121	public void moveToDeliver() {
	122	+ OracleService oracleService = (OracleService) DatabaseService.ORACLE_SERVICE.getService();
	123	+ oracleService.moveToDeliver();
	124	+ }
	125	+ },
	126	+ TYPE_OF_MSSQL("MSSQL") {
	127	+ @Override
	128	+ public boolean checkTableExists() {
	129	+ MssqlService mssqlService = (MssqlService) DatabaseService.MSSQL_SERVICE.getService();
	130	+ return mssqlService.checkTableExists();
	131	+ }
110	132
	133	+ @Override
	134	+ public List<MunjaonMsg> selectToDeliver(String msgType) {
	135	+ MssqlService mssqlService = (MssqlService) DatabaseService.MSSQL_SERVICE.getService();
	136	+ return mssqlService.selectToDeliver(msgType);
	137	+ }
	138	+
	139	+ @Override
	140	+ public int updateToDeliver(String msgId) {
	141	+ MssqlService mssqlService = (MssqlService) DatabaseService.MSSQL_SERVICE.getService();
	142	+ return mssqlService.updateToDeliver(msgId);
	143	+ }
	144	+
	145	+ @Override
	146	+ public int updateToReport(MunjaonMsg params) {
	147	+ MssqlService mssqlService = (MssqlService) DatabaseService.MSSQL_SERVICE.getService();
	148	+ return mssqlService.updateToReport(params);
	149	+ }
	150	+
	151	+ @Override
	152	+ public List<MunjaonMsg> selectToMove() {
	153	+ MssqlService mssqlService = (MssqlService) DatabaseService.MSSQL_SERVICE.getService();
	154	+ return mssqlService.selectToMove();
	155	+ }
	156	+
	157	+ @Override
	158	+ public List<MunjaonMsg> selectToExpire(String expireTime) {
	159	+ MssqlService mssqlService = (MssqlService) DatabaseService.MSSQL_SERVICE.getService();
	160	+ return mssqlService.selectToExpire(expireTime);
	161	+ }
	162	+
	163	+ @Override
	164	+ public int insertToLog(String msgId) {
	165	+ MssqlService mssqlService = (MssqlService) DatabaseService.MSSQL_SERVICE.getService();
	166	+ return mssqlService.insertToLog(msgId);
	167	+ }
	168	+
	169	+ @Override
	170	+ public int deleteFromDeliver(String msgId) {
	171	+ MssqlService mssqlService = (MssqlService) DatabaseService.ORACLE_SERVICE.getService();
	172	+ return mssqlService.deleteFromDeliver(msgId);
	173	+ }
	174	+
	175	+ @Override
	176	+ public void moveToDeliver() {
	177	+ MssqlService oracleService = (MssqlService) DatabaseService.MSSQL_SERVICE.getService();
	178	+ oracleService.moveToDeliver();
	179	+ }
	180	+ },
	181	+ TYPE_OF_POSTGRESQL("POSTGRESQL") {
	182	+ @Override
	183	+ public boolean checkTableExists() {
	184	+ PostgresqlService postgresqlService = (PostgresqlService) DatabaseService.POSTGRESQL_SERVICE.getService();
	185	+ return postgresqlService.checkTableExists();
	186	+ }
	187	+
	188	+ @Override
	189	+ public List<MunjaonMsg> selectToDeliver(String msgType) {
	190	+ PostgresqlService postgresqlService = (PostgresqlService) DatabaseService.POSTGRESQL_SERVICE.getService();
	191	+ return postgresqlService.selectToDeliver(msgType);
	192	+ }
	193	+
	194	+ @Override
	195	+ public int updateToDeliver(String msgId) {
	196	+ PostgresqlService postgresqlService = (PostgresqlService) DatabaseService.POSTGRESQL_SERVICE.getService();
	197	+ return postgresqlService.updateToDeliver(msgId);
	198	+ }
	199	+
	200	+ @Override
	201	+ public int updateToReport(MunjaonMsg params) {
	202	+ PostgresqlService postgresqlService = (PostgresqlService) DatabaseService.POSTGRESQL_SERVICE.getService();
	203	+ return postgresqlService.updateToReport(params);
	204	+ }
	205	+
	206	+ @Override
	207	+ public List<MunjaonMsg> selectToMove() {
	208	+ PostgresqlService postgresqlService = (PostgresqlService) DatabaseService.POSTGRESQL_SERVICE.getService();
	209	+ return postgresqlService.selectToMove();
	210	+ }
	211	+
	212	+ @Override
	213	+ public List<MunjaonMsg> selectToExpire(String expireTime) {
	214	+ PostgresqlService postgresqlService = (PostgresqlService) DatabaseService.POSTGRESQL_SERVICE.getService();
	215	+ return postgresqlService.selectToExpire(expireTime);
	216	+ }
	217	+
	218	+ @Override
	219	+ public int insertToLog(String msgId) {
	220	+ PostgresqlService postgresqlService = (PostgresqlService) DatabaseService.POSTGRESQL_SERVICE.getService();
	221	+ return postgresqlService.insertToLog(msgId);
	222	+ }
	223	+
	224	+ @Override
	225	+ public int deleteFromDeliver(String msgId) {
	226	+ PostgresqlService postgresqlService = (PostgresqlService) DatabaseService.POSTGRESQL_SERVICE.getService();
	227	+ return postgresqlService.deleteFromDeliver(msgId);
	228	+ }
	229	+
	230	+ @Override
	231	+ public void moveToDeliver() {
	232	+ PostgresqlService postgresqlService = (PostgresqlService) DatabaseService.POSTGRESQL_SERVICE.getService();
	233	+ postgresqlService.moveToDeliver();
	234	+ }
	235	+ },
	236	+ TYPE_OF_MYSQL("MYSQL") {
	237	+ @Override
	238	+ public boolean checkTableExists() {
	239	+ MysqlService mysqlService = (MysqlService) DatabaseService.MYSQL_SERVICE.getService();
	240	+ return mysqlService.checkTableExists();
	241	+ }
	242	+
	243	+ @Override
	244	+ public List<MunjaonMsg> selectToDeliver(String msgType) {
	245	+ MysqlService mysqlService = (MysqlService) DatabaseService.MYSQL_SERVICE.getService();
	246	+ return mysqlService.selectToDeliver(msgType);
	247	+ }
	248	+
	249	+ @Override
	250	+ public int updateToDeliver(String msgId) {
	251	+ MysqlService mysqlService = (MysqlService) DatabaseService.MYSQL_SERVICE.getService();
	252	+ return mysqlService.updateToDeliver(msgId);
	253	+ }
	254	+
	255	+ @Override
	256	+ public int updateToReport(MunjaonMsg params) {
	257	+ MysqlService mysqlService = (MysqlService) DatabaseService.MYSQL_SERVICE.getService();
	258	+ return mysqlService.updateToReport(params);
	259	+ }
	260	+
	261	+ @Override
	262	+ public List<MunjaonMsg> selectToMove() {
	263	+ MysqlService mysqlService = (MysqlService) DatabaseService.MYSQL_SERVICE.getService();
	264	+ return mysqlService.selectToMove();
	265	+ }
	266	+
	267	+ @Override
	268	+ public List<MunjaonMsg> selectToExpire(String expireTime) {
	269	+ MysqlService mysqlService = (MysqlService) DatabaseService.MYSQL_SERVICE.getService();
	270	+ return mysqlService.selectToExpire(expireTime);
	271	+ }
	272	+
	273	+ @Override
	274	+ public int insertToLog(String msgId) {
	275	+ MysqlService mysqlService = (MysqlService) DatabaseService.MYSQL_SERVICE.getService();
	276	+ return mysqlService.insertToLog(msgId);
	277	+ }
	278	+
	279	+ @Override
	280	+ public int deleteFromDeliver(String msgId) {
	281	+ MysqlService mysqlService = (MysqlService) DatabaseService.MYSQL_SERVICE.getService();
	282	+ return mysqlService.deleteFromDeliver(msgId);
	283	+ }
	284	+
	285	+ @Override
	286	+ public void moveToDeliver() {
	287	+ MysqlService mysqlService = (MysqlService) DatabaseService.MYSQL_SERVICE.getService();
	288	+ mysqlService.moveToDeliver();
111	289	}
112	290	};
113	291

Delete comment