connection pool size modity

pom.xml

@@ -177,7 +177,19 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.tomcat</groupId>
+                    <artifactId>tomcat-jdbc</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.zaxxer</groupId>
+            <artifactId>HikariCP</artifactId>
+            <version>4.0.3</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

src/main/java/com/its/api/its/controller/database/TbIfscController.java

@@ -30,6 +30,12 @@ public class TbIfscController {
         return service.findAll();
     }
 
+    @ApiOperation(value = "정보제공구간 전체조회-삭제되지 않은 정보(TB_IFSC)", response = TbIfscDto.class, responseContainer = "ArrayList")
+    @GetMapping(value = "/list", produces = {"application/json; charset=utf8"})
+    public List<TbIfscDto> findAllList() {
+        return service.findAllList();
+    }
+
     @ApiOperation(value = "정보제공구간 전체조회-지역센터(TB_IFSC)", response = TbLinkDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/local", produces = {"application/json; charset=utf8"})
     public List<TbIfscDto> findLocalAll() {

src/main/java/com/its/api/its/controller/database/TbLinkController.java

@@ -27,6 +27,12 @@ public class TbLinkController {
         return service.findAll();
     }
 
+    @ApiOperation(value = "링크정보 전체조회-삭제되지 않은 정보(TB_LINK)", response = TbLinkDto.class, responseContainer = "ArrayList")
+    @GetMapping(value = "/list", produces = {"application/json; charset=utf8"})
+    public List<TbLinkDto> findAllList() {
+        return service.findAllList();
+    }
+
     @ApiOperation(value = "링크정보 전체조회-지역센터(TB_LINK)", response = TbLinkDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/local", produces = {"application/json; charset=utf8"})
     public List<TbLinkDto> findLocalAll() {

src/main/java/com/its/api/its/controller/database/TbRoadController.java

@@ -29,6 +29,12 @@ public class TbRoadController {
         return service.findAll();
     }
 
+    @ApiOperation(value = "도로 전체조회-삭제되지 않은 정보(TB_ROAD)", response = TbRoadDto.class, responseContainer = "ArrayList")
+    @GetMapping(value = "/list", produces = {"application/json; charset=utf8"})
+    public List<TbRoadDto> findAllList() {
+        return service.findAllList();
+    }
+
     @ApiOperation(value = "도로 전체조회-지역센터(TB_ROAD)", response = TbRoadDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/local", produces = {"application/json; charset=utf8"})
     public List<TbRoadDto> findLocalAll() {

src/main/java/com/its/api/its/repository/ifsc/TbIfscRepository.java

@@ -14,6 +14,9 @@ public interface TbIfscRepository extends JpaRepository<TbIfsc, Long>, JpaSpecif
     @Query(value = "select p from TbIfsc p inner join fetch p.fromNode inner join fetch p.toNode")
     List<TbIfsc> findAll();
 
+    @Query(value = "select p from TbIfsc p inner join fetch p.fromNode inner join fetch p.toNode where p.delYn = 'N'")
+    List<TbIfsc> findAllList();
+
     @Query("select count(p.ifscId) from TbIfsc p where p.delYn = 'N'")
     Integer findAllCount();
 

src/main/java/com/its/api/its/repository/link/TbLinkRepository.java

@@ -14,6 +14,9 @@ public interface TbLinkRepository extends JpaRepository<TbLink, Long> , JpaSpeci
     @Query("select p from TbLink p inner join fetch p.fromNode inner join fetch p.toNode")
     List<TbLink> findAll();
 
+    @Query("select p from TbLink p inner join fetch p.fromNode inner join fetch p.toNode where p.delYn = 'N'")
+    List<TbLink> findAllList();
+
     @Query("select p from TbLink p inner join fetch p.fromNode inner join fetch p.toNode where p.delYn = 'N' and p.roadName is not null and p.roadName <> '-' and p.areaCd = 'LAT001'")
     List<TbLink> findLocalRoadLinkAll();
 

src/main/java/com/its/api/its/repository/road/TbRoadRepository.java

@@ -14,6 +14,9 @@ public interface TbRoadRepository extends JpaRepository<TbRoad, Long>, JpaSpecif
     @Query("select p from TbRoad p inner join fetch p.fromNode inner join fetch p.toNode")
     List<TbRoad> findAll();
 
+    @Query("select p from TbRoad p inner join fetch p.fromNode inner join fetch p.toNode where p.delYn = 'N'")
+    List<TbRoad> findAllList();
+
     @Query("select count(p.roadId) from TbRoad p where p.delYn = 'N'")
     Integer findAllCount();
 

src/main/java/com/its/api/its/service/ifsc/TbIfscService.java

@@ -26,7 +26,10 @@ public class TbIfscService {
                 .orElseThrow(() -> new NoSuchElementException("데이터가 존재하지 않습니다: " + id));
     }
 
-    // 전체 데이터 조회
+    /**
+     * 정보제공구간 편집 - 전체 데이터 조회
+     * @return
+     */
     @Transactional(readOnly = true)
     public List<TbIfscDto> findAll() {
         List<TbIfscDto> result = new ArrayList<>();
@@ -37,6 +40,20 @@ public class TbIfscService {
         return result;
     }
 
+    /**
+     * 삭제되지 않은 정보제공구간 전체 조회
+     * @return
+     */
+    @Transactional(readOnly = true)
+    public List<TbIfscDto> findAllList() {
+        List<TbIfscDto> result = new ArrayList<>();
+        List<TbIfsc> data = this.repo.findAllList();
+        for (TbIfsc entity : data) {
+            result.add(entity.toDto());
+        }
+        return result;
+    }
+
     // 데이터 1건 조회(기존 데이터가 반드시 존재해야 함)
     @Transactional(readOnly = true)
     public TbIfscDto findById(Long id) {

src/main/java/com/its/api/its/service/link/TbLinkService.java

@@ -28,7 +28,10 @@ public class TbLinkService {
                 .orElseThrow(() -> new NoSuchElementException("데이터가 존재하지 않습니다: " + id));
     }
 
-    // 전체 데이터 조회
+    /**
+     * 링크 관리 전체 데이터 조회
+     * @return
+     */
     @Transactional(readOnly = true)
     public List<TbLinkDto> findAll() {
         List<TbLinkDto> result = new ArrayList<>();
@@ -39,6 +42,20 @@ public class TbLinkService {
         return result;
     }
 
+    /**
+     * 삭제되지 않은 링크 전체 조회
+     * @return
+     */
+    @Transactional(readOnly = true)
+    public List<TbLinkDto> findAllList() {
+        List<TbLinkDto> result = new ArrayList<>();
+        List<TbLink> data = this.repo.findAllList();
+        for (TbLink entity : data) {
+            result.add(entity.toDto());
+        }
+        return result;
+    }
+
     // 지역센터 전체 데이터 조회
     @Transactional(readOnly = true)
     public List<TbLinkDto> findLocalAll() {

src/main/java/com/its/api/its/service/road/TbRoadService.java

@@ -26,7 +26,10 @@ public class TbRoadService {
                 .orElseThrow(() -> new NoSuchElementException("데이터가 존재하지 않습니다: " + id));
     }
 
-    // 전체 데이터 조회
+    /**
+     * 모든 정보 조회
+     * @return
+     */
     @Transactional(readOnly = true)
     public List<TbRoadDto> findAll() {
         List<TbRoadDto> result = new ArrayList<>();
@@ -37,6 +40,20 @@ public class TbRoadService {
         return result;
     }
 
+    /**
+     * 삭제되지 않은 정보 조회
+     * @return
+     */
+    @Transactional(readOnly = true)
+    public List<TbRoadDto> findAllList() {
+        List<TbRoadDto> result = new ArrayList<>();
+        List<TbRoad> data = this.repo.findAllList();
+        for (TbRoad entity : data) {
+            result.add(entity.toDto());
+        }
+        return result;
+    }
+
     // 지역센터 전체 데이터 조회
     @Transactional(readOnly = true)
     public List<TbRoadDto> findLocalAll() {

src/main/resources/application-dev.yml

@@ -2,7 +2,8 @@ spring:
   datasource:
     hikari:
       driver-class-name: com.tmax.tibero.jdbc.TbDriver
-      jdbc-url: jdbc:tibero:thin:@115.91.94.42:8629:tibero
+      #jdbc-url: jdbc:tibero:thin:@115.91.94.42:8629:tibero
+      jdbc-url: jdbc:tibero:thin:@192.168.20.99:8629:tibero
       username: yiits
       password: yiits
       minimumIdle: 5
@@ -19,9 +20,15 @@ spring:
   utis-datasource:
     hikari:
       driver-class-name: com.tmax.tibero.jdbc.TbDriver
-      jdbc-url: jdbc:tibero:thin:@115.91.94.42:8629:tibero
+      #jdbc-url: jdbc:tibero:thin:@115.91.94.42:8629:tibero
+      jdbc-url: jdbc:tibero:thin:@192.168.20.99:8629:tibero
       username: rutis
       password: rutis
+      minimumIdle: 3
+      maximumIdle: 10
+      maximumPoolSize: 20
+      idleTimeout: 30000
+      connectTimeout: 10000
   utis-jpa:
     database-platform: org.hibernate.dialect.Oracle10gDialect
     properties:
@@ -31,9 +38,15 @@ spring:
   bis-datasource:
     hikari:
       driver-class-name: com.tmax.tibero.jdbc.TbDriver
-      jdbc-url: jdbc:tibero:thin:@115.91.94.42:8629:tibero
+      #jdbc-url: jdbc:tibero:thin:@115.91.94.42:8629:tibero
+      jdbc-url: jdbc:tibero:thin:@192.168.20.99:8629:tibero
       username: yiits
       password: yiits
+      minimumIdle: 3
+      maximumIdle: 10
+      maximumPoolSize: 20
+      idleTimeout: 30000
+      connectTimeout: 10000
   bis-jpa:
     database-platform: org.hibernate.dialect.Oracle10gDialect
     properties: