shjung 3 роки тому
батько
коміт
3f2ad67138

+ 3 - 3
src/main/java/com/its/op/controller/its/scrs/TbScIxrGemtMngmController.java

@@ -33,10 +33,10 @@ public class TbScIxrGemtMngmController {
         return this.service.findAllList();
     }
 
-    @ApiOperation(value = "교차로 기하구조 관리 개별조회(TB_SC_IXR_GEMT_MNGM)", response = TbScIxrGemtMngmDto.class)
+    @ApiOperation(value = "교차로 기하구조 관리 개별조회(TB_SC_IXR_GEMT_MNGM)", response = TbScIxrGemtMngmDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/{ixrId}", produces = {"application/json; charset=utf8"})
-    public TbScIxrGemtMngmDto findById(@PathVariable("ixrId") final TbScIxrGemtMngmKey ixrId) {
-        return this.service.findById(ixrId);
+    public List<TbScIxrGemtMngmDto> findListById(@PathVariable("ixrId") final String ixrId) {
+        return this.service.findListById(ixrId);
     }
 
     @ApiOperation(value = "교차로 기하구조 관리 정보변경(TB_SC_IXR_GEMT_MNGM)", response = TbScIxrGemtMngmDto.class)

+ 3 - 3
src/main/java/com/its/op/controller/its/scrs/TbScTrfcCndtMngmController.java

@@ -33,10 +33,10 @@ public class TbScTrfcCndtMngmController {
         return this.service.findAllList();
     }
 
-    @ApiOperation(value = "교통 조건 관리 개별조회(TB_SC_TRFC_CNDT_MNGM)", response = TbScTrfcCndtMngmDto.class)
+    @ApiOperation(value = "교통 조건 관리 개별조회(TB_SC_TRFC_CNDT_MNGM)", response = TbScTrfcCndtMngmDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/{ixrId}", produces = {"application/json; charset=utf8"})
-    public TbScTrfcCndtMngmDto findById(@PathVariable("ixrId") final TbScTrfcCndtMngmKey ixrId) {
-        return this.service.findById(ixrId);
+    public List<TbScTrfcCndtMngmDto> findListById(@PathVariable("ixrId") final String ixrId) {
+        return this.service.findListById(ixrId);
     }
 
     @ApiOperation(value = "교통 조건 관리 정보변경(TB_SC_TRFC_CNDT_MNGM)", response = TbScTrfcCndtMngmDto.class)

+ 3 - 0
src/main/java/com/its/op/dao/repository/its/scrs/TbScIxrGemtMngmRepository.java

@@ -5,6 +5,7 @@ import com.its.op.entity.its.scrs.TbScIxrGemtMngmKey;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -18,4 +19,6 @@ public interface TbScIxrGemtMngmRepository extends JpaRepository<TbScIxrGemtMngm
     @Query("select p from TbScIxrGemtMngm p")
     List<TbScIxrGemtMngm> findAllList();
 
+    @Query("select p from TbScIxrGemtMngm p where p.ixrId = :ixrId")
+    List<TbScIxrGemtMngm> findListById(@Param("ixrId") String ixrId);
 }

+ 3 - 0
src/main/java/com/its/op/dao/repository/its/scrs/TbScTrfcCndtMngmRepository.java

@@ -5,6 +5,7 @@ import com.its.op.entity.its.scrs.TbScTrfcCndtMngmKey;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -18,4 +19,6 @@ public interface TbScTrfcCndtMngmRepository extends JpaRepository<TbScTrfcCndtMn
     @Query("select p from TbScTrfcCndtMngm p")
     List<TbScTrfcCndtMngm> findAllList();
 
+    @Query("select p from TbScTrfcCndtMngm p where p.ixrId = :ixrId")
+    List<TbScTrfcCndtMngm> findListById(@Param("ixrId") String ixrId);
 }

+ 12 - 0
src/main/java/com/its/op/service/its/scrs/TbScIxrGemtMngmService.java

@@ -2,8 +2,10 @@ package com.its.op.service.its.scrs;
 
 import com.its.op.dao.repository.its.scrs.TbScIxrGemtMngmRepository;
 import com.its.op.dto.its.scrs.TbScIxrGemtMngmDto;
+import com.its.op.dto.its.scrs.TbScTrfcCndtMngmDto;
 import com.its.op.entity.its.scrs.TbScIxrGemtMngm;
 import com.its.op.entity.its.scrs.TbScIxrGemtMngmKey;
+import com.its.op.entity.its.scrs.TbScTrfcCndtMngm;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -61,6 +63,16 @@ public class TbScIxrGemtMngmService {
         return entity.toDto();
     }
 
+    @Transactional(readOnly = true)
+    public List<TbScIxrGemtMngmDto> findListById(String ixrId) {
+        List<TbScIxrGemtMngm> data = this.repo.findListById(ixrId);
+        List<TbScIxrGemtMngmDto> result = new ArrayList<>();
+        for (TbScIxrGemtMngm entity : data) {
+            result.add(entity.toDto());
+        }
+        return result;
+    }
+
     // 데이터 변경
     @Transactional
     public TbScIxrGemtMngmDto updateById(TbScIxrGemtMngmKey ixrId, TbScIxrGemtMngmDto.TbScIxrGemtMngmUpdReq req) {

+ 7 - 3
src/main/java/com/its/op/service/its/scrs/TbScTrfcCndtMngmService.java

@@ -56,9 +56,13 @@ public class TbScTrfcCndtMngmService {
 
     // 데이터 1건 조회(기존 데이터가 반드시 존재해야 함)
     @Transactional(readOnly = true)
-    public TbScTrfcCndtMngmDto findById(TbScTrfcCndtMngmKey ixrId) {
-        TbScTrfcCndtMngm entity = requireOne(ixrId);
-        return entity.toDto();
+    public List<TbScTrfcCndtMngmDto> findListById(String ixrId) {
+        List<TbScTrfcCndtMngm> data = this.repo.findListById(ixrId);
+        List<TbScTrfcCndtMngmDto> result = new ArrayList<>();
+        for (TbScTrfcCndtMngm entity : data) {
+            result.add(entity.toDto());
+        }
+        return result;
     }
 
     // 데이터 변경