Merge branch 'main' of http://115.91.94.42:3000/PYEONGTAEK/its-op-server

src/main/java/com/its/op/controller/its/common/CommonController.java

@@ -1,7 +1,7 @@
 package com.its.op.controller.its.common;
 
 import com.its.op.dto.its.code.TbClctSystStupDto;
-import com.its.op.dto.its.code.TbSectGradClsfDto;
+import com.its.op.dto.its.code.TbSectGradDto;
 import com.its.op.dto.its.common.CongestTrafficDto;
 import com.its.op.dto.its.common.DetlTrafIfscDto;
 import com.its.op.dto.its.common.DetlTrafLinkDto;
@@ -80,9 +80,9 @@ public class CommonController {
         return this.commonService.findAllDetailTrafficRoad(id);
     }
 
-    @ApiOperation(value = "구간소통등급 목록 조회", response = TbSectGradClsfDto.class, responseContainer = "ArrayList")
+    @ApiOperation(value = "구간소통등급 목록 조회", response = TbSectGradDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/sect-grad-cd/list", produces = {"application/json; charset=utf8"})
-    public List<TbSectGradClsfDto> findAllSectGradCdList() {
+    public List<TbSectGradDto> findAllSectGradCdList() {
         return this.sectGradClsfService.findAll();
     }
 //

src/main/java/com/its/op/controller/its/database/TbCmtrGradClsfController.java

@@ -1,6 +1,6 @@
 package com.its.op.controller.its.database;
 
-import com.its.op.dto.its.code.TbCmtrGradClsfDto;
+import com.its.op.dto.its.code.TbSectGradStupDto;
 import com.its.op.service.its.code.TbSectGradStupService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -21,24 +21,24 @@ public class TbCmtrGradClsfController {
 
     private final TbSectGradStupService service;
 
-    @ApiOperation(value = "소통 등급 분류 전체조회(TB_SECT_GRAD_STUP)", response = TbCmtrGradClsfDto.class, responseContainer = "ArrayList")
+    @ApiOperation(value = "소통 등급 분류 전체조회(TB_SECT_GRAD_STUP)", response = TbSectGradStupDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "", produces = {"application/json; charset=utf8"})
-    public List<TbCmtrGradClsfDto> findAll() {
+    public List<TbSectGradStupDto> findAll() {
         return service.findAll();
     }
 
-    @ApiOperation(value = "구간등급에 따른 소통등급 분류 목록 조회(TB_SECT_GRAD_STUP)", response = TbCmtrGradClsfDto.class, responseContainer = "ArrayList")
+    @ApiOperation(value = "구간등급에 따른 소통등급 분류 목록 조회(TB_SECT_GRAD_STUP)", response = TbSectGradStupDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/list/{sectGradCd}", produces = {"application/json; charset=utf8"})
-    public List<TbCmtrGradClsfDto> findAllGradeList(
+    public List<TbSectGradStupDto> findAllGradeList(
             @ApiParam(name = "sectGradCd", value = "구간등급코드", example = "SRT1", required = true)
             @PathVariable final String sectGradCd
     ) {
         return service.findAllGradeList(sectGradCd);
     }
 
-    @ApiOperation(value = "소통 등급 분류 정보변경/생성-목록(TB_SECT_GRAD_STUP)", response = TbCmtrGradClsfDto.class, responseContainer = "ArrayList")
+    @ApiOperation(value = "소통 등급 분류 정보변경/생성-목록(TB_SECT_GRAD_STUP)", response = TbSectGradStupDto.class, responseContainer = "ArrayList")
     @PostMapping(value = "", produces = {"application/json; charset=utf8"})
-    public List<TbCmtrGradClsfDto> mergeInfoList(@RequestBody @Valid final List<TbCmtrGradClsfDto.TbCmtrGradClsfUpdReq> req) {
+    public List<TbSectGradStupDto> mergeInfoList(@RequestBody @Valid final List<TbSectGradStupDto.TbCmtrGradClsfUpdReq> req) {
         return this.service.mergeInfoList(req);
     }
 

src/main/java/com/its/op/dto/its/code/TbSectGradClsfDto.java → src/main/java/com/its/op/dto/its/code/TbSectGradDto.java

@@ -14,8 +14,8 @@ import java.io.Serializable;
  */
 @Data
 @Builder
-@ApiModel("TbSectGradClsfDto(구간 등급 분류)")
-public class TbSectGradClsfDto implements Serializable {
+@ApiModel("TbSectGradDto(구간 등급 분류)")
+public class TbSectGradDto implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("구간 등급 코드")  // N VARCHAR(7)

src/main/java/com/its/op/dto/its/code/TbCmtrGradClsfDto.java → src/main/java/com/its/op/dto/its/code/TbSectGradStupDto.java

@@ -16,8 +16,8 @@ import java.io.Serializable;
  */
 @Data
 @Builder
-@ApiModel("TbCmtrGradClsfDto(소통 등급 분류)")
-public class TbCmtrGradClsfDto implements Serializable {
+@ApiModel("TbSectGradStupDto(소통 등급 분류)")
+public class TbSectGradStupDto implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("기준 구간 등급 코드")  // N VARCHAR(7)

src/main/java/com/its/op/entity/its/code/TbSectGrad.java

@@ -1,6 +1,6 @@
 package com.its.op.entity.its.code;
 
-import com.its.op.dto.its.code.TbSectGradClsfDto;
+import com.its.op.dto.its.code.TbSectGradDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -34,8 +34,8 @@ public class TbSectGrad implements Serializable {
     @Column(name = "SECT_GRAD_NM", length = 40)
     private String sectGradNm;
 
-    public TbSectGradClsfDto toDto() {
-        return TbSectGradClsfDto.builder()
+    public TbSectGradDto toDto() {
+        return TbSectGradDto.builder()
                 .sectGradCd(this.sectGradCd)
                 .sectGradNm(this.sectGradNm)
                 .sectGradDesc("[" + this.sectGradCd + "] " + this.sectGradNm)
@@ -46,7 +46,7 @@ public class TbSectGrad implements Serializable {
         this.sectGradCd = sectGradCd;
     }
 
-    public void updateInfo(TbSectGradClsfDto.TbSectGradClsfUpdReq req) {
+    public void updateInfo(TbSectGradDto.TbSectGradClsfUpdReq req) {
         this.sectGradNm = req.getSectGradNm();
     }
 

src/main/java/com/its/op/entity/its/code/TbSectGradStup.java

@@ -1,6 +1,6 @@
 package com.its.op.entity.its.code;
 
-import com.its.op.dto.its.code.TbCmtrGradClsfDto;
+import com.its.op.dto.its.code.TbSectGradStupDto;
 import com.its.op.global.CmmnCdManager;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -58,8 +58,8 @@ public class TbSectGradStup implements Serializable {
 //    @NotFound(action = NotFoundAction.IGNORE)
 //    private TbSectGrad sect;
 
-    public TbCmtrGradClsfDto toDto() {
-        TbCmtrGradClsfDto dto = TbCmtrGradClsfDto.builder()
+    public TbSectGradStupDto toDto() {
+        TbSectGradStupDto dto = TbSectGradStupDto.builder()
                 .sectGradTp(this.sectGradTp)
                 .sectGradCd(this.sectGradCd)
                 .cmtrGradCd(this.cmtrGradCd)
@@ -79,12 +79,7 @@ public class TbSectGradStup implements Serializable {
         return dto;
     }
 
-//    public TbSectGradStup(String sectGradCd, String cmtrGradCd) {
-//        this.sectGradCd = sectGradCd;
-//        this.cmtrGradCd = cmtrGradCd;
-//    }
-
-    public void updateInfo(TbCmtrGradClsfDto.TbCmtrGradClsfUpdReq req) {
+    public void updateInfo(TbSectGradStupDto.TbCmtrGradClsfUpdReq req) {
         this.lwstTrvlSped = req.getLwstTrvlSped();
         this.hghsTrvlSped = req.getHghsTrvlSped();
         this.cngsGradYn = req.getCngsGradYn();

src/main/java/com/its/op/service/its/code/TbSectGradService.java

@@ -1,7 +1,7 @@
 package com.its.op.service.its.code;
 
 import com.its.op.dao.repository.its.code.TbSectGradRepository;
-import com.its.op.dto.its.code.TbSectGradClsfDto;
+import com.its.op.dto.its.code.TbSectGradDto;
 import com.its.op.entity.its.code.TbSectGrad;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -21,8 +21,8 @@ public class TbSectGradService {
 
     // 전체 데이터 조회
     @Transactional(readOnly = true)
-    public List<TbSectGradClsfDto> findAll() {
-        List<TbSectGradClsfDto> result = new ArrayList<>();
+    public List<TbSectGradDto> findAll() {
+        List<TbSectGradDto> result = new ArrayList<>();
         List<TbSectGrad> data = this.repo.findAll();
         for (TbSectGrad entity : data) {
             result.add(entity.toDto());
@@ -32,9 +32,9 @@ public class TbSectGradService {
 
     // 데이터 변경 또는 생성-목록(데이터가 존재하면 업데이트 없으면 신규로 생성)
     @Transactional
-    public List<TbSectGradClsfDto> mergeInfoList(List<TbSectGradClsfDto.TbSectGradClsfUpdReq> reqList) {
-        List<TbSectGradClsfDto> result = new ArrayList<>();
-        for (TbSectGradClsfDto.TbSectGradClsfUpdReq req : reqList) {
+    public List<TbSectGradDto> mergeInfoList(List<TbSectGradDto.TbSectGradClsfUpdReq> reqList) {
+        List<TbSectGradDto> result = new ArrayList<>();
+        for (TbSectGradDto.TbSectGradClsfUpdReq req : reqList) {
             TbSectGrad obj = req.toEntity();
             this.repo.save(obj);
             result.add(obj.toDto());
@@ -44,7 +44,7 @@ public class TbSectGradService {
 
     // 데이터 변경 또는 생성-개별(데이터가 존재하면 업데이트 없으면 신규로 생성)
     @Transactional
-    public TbSectGradClsfDto mergeInfo(TbSectGradClsfDto.TbSectGradClsfUpdReq req) {
+    public TbSectGradDto mergeInfo(TbSectGradDto.TbSectGradClsfUpdReq req) {
         TbSectGrad obj = req.toEntity();
         this.repo.save(obj);
         return obj.toDto();
@@ -52,8 +52,8 @@ public class TbSectGradService {
 
     // 정보 삭제-목록, 존재하는 데이터 만 삭제
     @Transactional
-    public List<TbSectGradClsfDto> deleteByIds(List<String> ids) {
-        List<TbSectGradClsfDto> result = new ArrayList<>();
+    public List<TbSectGradDto> deleteByIds(List<String> ids) {
+        List<TbSectGradDto> result = new ArrayList<>();
         for (String id : ids) {
             Optional<TbSectGrad> obj = this.repo.findById(id);
             if (obj.isPresent()) {

src/main/java/com/its/op/service/its/code/TbSectGradStupService.java

@@ -1,8 +1,8 @@
 package com.its.op.service.its.code;
 
 import com.its.op.dao.repository.its.code.TbSectGradStupRepository;
-import com.its.op.dto.its.code.TbCmtrGradClsfDto;
-import com.its.op.dto.its.code.TbSectGradClsfDto;
+import com.its.op.dto.its.code.TbSectGradStupDto;
+import com.its.op.dto.its.code.TbSectGradDto;
 import com.its.op.entity.its.code.TbSectGradStup;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -20,19 +20,20 @@ public class TbSectGradStupService {
 
     private final TbSectGradStupRepository repo;
     private final TbSectGradService sectService;
-    private final HashMap<String, TbSectGradClsfDto> sectGradMap = new HashMap<>();
+    private HashMap<String, TbSectGradDto> sectGradMap;// = new HashMap<>();
 
 
     private void loadSectGrad() {
-        List<TbSectGradClsfDto> sectData = this.sectService.findAll();
-        for (TbSectGradClsfDto entity : sectData) {
+        this.sectGradMap = new HashMap<>();
+        List<TbSectGradDto> sectData = this.sectService.findAll();
+        for (TbSectGradDto entity : sectData) {
             this.sectGradMap.put(entity.getSectGradCd(), entity);
         }
     }
 
-    private void setSectGradDesc(TbCmtrGradClsfDto obj) {
+    private void setSectGradDesc(TbSectGradStupDto obj) {
         String sectGradCd = obj.getSectGradCd();
-        TbSectGradClsfDto sect = this.sectGradMap.get(sectGradCd);
+        TbSectGradDto sect = this.sectGradMap.get(sectGradCd);
         if (sect == null) {
             obj.setSectGradDesc("[" + sectGradCd + "] ?");
         }
@@ -43,72 +44,63 @@ public class TbSectGradStupService {
 
     // 전체 데이터 조회
     @Transactional(readOnly = true)
-    public List<TbCmtrGradClsfDto> findAll() {
-        List<TbCmtrGradClsfDto> result = new ArrayList<>();
-        loadSectGrad();
+    public List<TbSectGradStupDto> findAll() {
+        List<TbSectGradStupDto> result = new ArrayList<>();
+        try {
+            loadSectGrad();
 
-        List<TbSectGradStup> data = this.repo.findAll();
-        for (TbSectGradStup entity : data) {
-            TbCmtrGradClsfDto dto = entity.toDto();
-            setSectGradDesc(dto);
-            result.add(dto);
+            List<TbSectGradStup> data = this.repo.findAll();
+            for (TbSectGradStup entity : data) {
+                TbSectGradStupDto dto = entity.toDto();
+                setSectGradDesc(dto);
+                result.add(dto);
+            }
+        }
+        finally {
+            this.sectGradMap = null;
         }
         return result;
     }
 
     // 데이터 변경 또는 생성-목록(데이터가 존재하면 업데이트 없으면 신규로 생성)
     @Transactional
-    public List<TbCmtrGradClsfDto> mergeInfoList(List<TbCmtrGradClsfDto.TbCmtrGradClsfUpdReq> reqList) {
-        List<TbCmtrGradClsfDto> result = new ArrayList<>();
-        loadSectGrad();
+    public List<TbSectGradStupDto> mergeInfoList(List<TbSectGradStupDto.TbCmtrGradClsfUpdReq> reqList) {
+        List<TbSectGradStupDto> result = new ArrayList<>();
+        try {
+            loadSectGrad();
 
-        for (TbCmtrGradClsfDto.TbCmtrGradClsfUpdReq req : reqList) {
-            TbSectGradStup obj = req.toEntity();
-            this.repo.save(obj);
-            TbCmtrGradClsfDto dto = obj.toDto();
-            setSectGradDesc(dto);
-            result.add(dto);
+            for (TbSectGradStupDto.TbCmtrGradClsfUpdReq req : reqList) {
+                TbSectGradStup obj = req.toEntity();
+                this.repo.save(obj);
+                TbSectGradStupDto dto = obj.toDto();
+                setSectGradDesc(dto);
+                result.add(dto);
+            }
+        }
+        finally {
+            this.sectGradMap = null;
         }
         return result;
     }
 
-    // 데이터 변경 또는 생성-개별(데이터가 존재하면 업데이트 없으면 신규로 생성)
-//    @Transactional
-//    public TbCmtrGradClsfDto mergeInfo(TbCmtrGradClsfDto.TbCmtrGradClsfUpdReq req) {
-//        TbSectGradStup obj = req.toEntity();
-//        this.repo.save(obj);
-//        return obj.toDto();
-//    }
-//
-//    // 정보 삭제-목록, 존재하는 데이터 만 삭제
-//    @Transactional
-//    public List<TbCmtrGradClsfDto> deleteByIds(List<TbSectGradStupKey> ids) {
-//        List<TbCmtrGradClsfDto> result = new ArrayList<>();
-//        for (TbSectGradStupKey id : ids) {
-//            Optional<TbSectGradStup> obj = this.repo.findById(id);
-//            if (obj.isPresent()) {
-//                this.repo.deleteById(id);
-//                result.add(obj.get().toDto());
-//            }
-//        }
-//        return result;
-//    }
-//
     /**
      * 구간등급에 해당되는 소통등급 정보 조회
-     * @param sectGradCd
-     * @return
      */
-    @Transactional
-    public List<TbCmtrGradClsfDto> findAllGradeList(String sectGradCd) {
-        List<TbCmtrGradClsfDto> result = new ArrayList<>();
-        loadSectGrad();
+    @Transactional(readOnly = true)
+    public List<TbSectGradStupDto> findAllGradeList(String sectGradCd) {
+        List<TbSectGradStupDto> result = new ArrayList<>();
+        try {
+            loadSectGrad();
 
-        List<TbSectGradStup> data = this.repo.findAllGradeList(sectGradCd);
-        for (TbSectGradStup entity : data) {
-            TbCmtrGradClsfDto dto = entity.toDto();
-            setSectGradDesc(dto);
-            result.add(dto);
+            List<TbSectGradStup> data = this.repo.findAllGradeList(sectGradCd);
+            for (TbSectGradStup entity : data) {
+                TbSectGradStupDto dto = entity.toDto();
+                setSectGradDesc(dto);
+                result.add(dto);
+            }
+        }
+        finally {
+            this.sectGradMap = null;
         }
         return result;
     }