new

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

@@ -1,6 +1,7 @@
 package com.its.api.its.controller.database;
 
 import com.its.api.its.model.dto.atrd.TbAtrdDto;
+import com.its.api.its.model.dto.common.UsageCountDto;
 import com.its.api.its.service.atrd.TbAtrdService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -35,9 +36,9 @@ public class TbAtrdController {
         return this.service.findById(id);
     }
 
-    @ApiOperation(value = "간선도로 사용여부 조회(신규 아이디 만들때 사용)", response = Integer.class)
+    @ApiOperation(value = "간선도로 사용여부 조회(신규 아이디 만들때 사용)", response = UsageCountDto.class)
     @GetMapping(value = "/usage/{id}", produces = {"application/json; charset=utf8"})
-    public Integer findUsageId(
+    public UsageCountDto findUsageId(
             @ApiParam(name = "id", value = "간선도로 ID", example = "ATR2001", required = true)
             @PathVariable final String id) {
         return this.service.findUsageId(id);

src/main/java/com/its/api/its/controller/vms/TbVmsIfscController.java

@@ -1,6 +1,7 @@
 package com.its.api.its.controller.vms;
 
 import com.its.api.its.model.dto.common.NewIdLongDto;
+import com.its.api.its.model.dto.common.UsageCountDto;
 import com.its.api.its.model.dto.vms.TbVmsIfscCmtrGradDto;
 import com.its.api.its.model.dto.vms.TbVmsIfscDto;
 import com.its.api.its.service.vms.TbVmsIfscCmtrGradService;
@@ -79,9 +80,9 @@ public class TbVmsIfscController {
         return this.cmtrGradService.saveAllIfscCmtrGradInfo(req);
     }
 
-    @ApiOperation(value = "VMS 정보제공구간 사용여부 조회(TB_VMS_IFSC)", response = Integer.class)
+    @ApiOperation(value = "VMS 정보제공구간 사용여부 조회(TB_VMS_IFSC)", response = UsageCountDto.class)
     @GetMapping(value = "/usage/{id}", produces = {"application/json; charset=utf8"})
-    public Integer findUsageCountByVmsIfscId(@PathVariable final Long id) {
+    public UsageCountDto findUsageCountByVmsIfscId(@PathVariable final Long id) {
         return this.service.findUsageCountByVmsIfscId(id);
     }
 

src/main/java/com/its/api/its/controller/vms/TbVmsSymbLibVmp0Controller.java

@@ -1,5 +1,7 @@
 package com.its.api.its.controller.vms;
 
+import com.its.api.its.model.dto.common.NewIdIntegerDto;
+import com.its.api.its.model.dto.common.UsageCountDto;
 import com.its.api.its.model.dto.vms.TbVmsSymbLibDto;
 import com.its.api.its.service.vms.TbVmsSymbLibVmp0Service;
 import io.swagger.annotations.Api;
@@ -66,15 +68,15 @@ public class TbVmsSymbLibVmp0Controller {
     }
 */
 
-    @ApiOperation(value = "VMS 심벌이미지 사용여부 조회(TB_VMS_SYMB_LIB)", response = Integer.class)
+    @ApiOperation(value = "VMS 심벌이미지 사용여부 조회(TB_VMS_SYMB_LIB)", response = UsageCountDto.class)
     @GetMapping(value = "/usage/{id}", produces = {"application/json; charset=utf8"})
-    public Integer findUsageCountBySymbolId(@PathVariable final Integer id) {
+    public UsageCountDto findUsageCountBySymbolId(@PathVariable final Integer id) {
         return this.service.findUsageCountBySymbolId(id);
     }
 
-    @ApiOperation(value = "VMS 심벌이미지 신규 ID 조회(TB_VMS_SYMB_LIB)", response = Integer.class)
+    @ApiOperation(value = "VMS 심벌이미지 신규 ID 조회(TB_VMS_SYMB_LIB)", response = NewIdIntegerDto.class)
     @GetMapping(value = "/new-id", produces = {"application/json; charset=utf8"})
-    public Integer getNewSymbolId() {
+    public NewIdIntegerDto getNewSymbolId() {
         return this.service.getNewSymbolId();
     }
 

src/main/java/com/its/api/its/controller/vms/TbVmsSymbLibVmp1Controller.java

@@ -1,10 +1,12 @@
 package com.its.api.its.controller.vms;
 
-import com.its.api.its.service.vms.TbVmsSymbLibVmp1Service;
+import com.its.api.its.model.dto.common.NewIdIntegerDto;
+import com.its.api.its.model.dto.common.UsageCountDto;
 import com.its.api.its.model.dto.vms.TbVmsIfscRltnDto;
 import com.its.api.its.model.dto.vms.TbVmsSymbLibDto;
 import com.its.api.its.model.dto.vms.TbVmsSymbLibIfscVMP1Dto;
 import com.its.api.its.service.vms.TbVmsIfscRltnService;
+import com.its.api.its.service.vms.TbVmsSymbLibVmp1Service;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -76,15 +78,15 @@ public class TbVmsSymbLibVmp1Controller {
     }
 */
 
-    @ApiOperation(value = "VMS 소통정보 배경이미지 사용여부 조회(TB_VMS_SYMB_LIB)", response = Integer.class)
+    @ApiOperation(value = "VMS 소통정보 배경이미지 사용여부 조회(TB_VMS_SYMB_LIB)", response = UsageCountDto.class)
     @GetMapping(value = "/usage/{id}", produces = {"application/json; charset=utf8"})
-    public Integer findUsageCountBySymbolId(@PathVariable final Integer id) {
+    public UsageCountDto findUsageCountBySymbolId(@PathVariable final Integer id) {
         return this.service.findUsageCountBySymbolId(id);
     }
 
-    @ApiOperation(value = "VMS 소통정보 배경이미지 신규 ID 조회(TB_VMS_SYMB_LIB)", response = Integer.class)
+    @ApiOperation(value = "VMS 소통정보 배경이미지 신규 ID 조회(TB_VMS_SYMB_LIB)", response = NewIdIntegerDto.class)
     @GetMapping(value = "/new-id", produces = {"application/json; charset=utf8"})
-    public Integer getNewSymbolId() {
+    public NewIdIntegerDto getNewSymbolId() {
         return this.service.getNewSymbolId();
     }
 

src/main/java/com/its/api/its/controller/vms/TbVmsSymbLibVmp2Controller.java

@@ -1,8 +1,10 @@
 package com.its.api.its.controller.vms;
 
-import com.its.api.its.service.vms.TbVmsSymbLibVmp2Service;
+import com.its.api.its.model.dto.common.NewIdIntegerDto;
+import com.its.api.its.model.dto.common.UsageCountDto;
 import com.its.api.its.model.dto.vms.TbVmsSymbLibDto;
 import com.its.api.its.model.dto.vms.TbVmsSymbLibIfscVMP2Dto;
+import com.its.api.its.service.vms.TbVmsSymbLibVmp2Service;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -67,15 +69,15 @@ public class TbVmsSymbLibVmp2Controller {
     }
 */
 
-    @ApiOperation(value = "VMS 소통정보 이미지 사용여부 조회(TB_VMS_SYMB_LIB)", response = Integer.class)
+    @ApiOperation(value = "VMS 소통정보 이미지 사용여부 조회(TB_VMS_SYMB_LIB)", response = UsageCountDto.class)
     @GetMapping(value = "/usage/{id}", produces = {"application/json; charset=utf8"})
-    public Integer findUsageCountBySymbolId(@PathVariable final Integer id) {
+    public UsageCountDto findUsageCountBySymbolId(@PathVariable final Integer id) {
         return this.service.findUsageCountBySymbolId(id);
     }
 
-    @ApiOperation(value = "VMS 소통정보 이미지 신규 ID 조회(TB_VMS_SYMB_LIB)", response = Integer.class)
+    @ApiOperation(value = "VMS 소통정보 이미지 신규 ID 조회(TB_VMS_SYMB_LIB)", response = NewIdIntegerDto.class)
     @GetMapping(value = "/new-id", produces = {"application/json; charset=utf8"})
-    public Integer getNewSymbolId() {
+    public NewIdIntegerDto NewIdIntegerDto() {
         return this.service.getNewSymbolId();
     }
 

src/main/java/com/its/api/its/model/dto/common/UsageCountDto.java

@@ -0,0 +1,24 @@
+package com.its.api.its.model.dto.common;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * Long Usage Count DTO Class
+ */
+@Data
+@Builder
+@ApiModel("UsageCountDto(사용 갯수 정보)")
+public class UsageCountDto implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("사용갯수")
+    @JsonProperty("count")
+    private Integer count;
+
+}

src/main/java/com/its/api/its/service/atrd/TbAtrdService.java

@@ -2,6 +2,7 @@ package com.its.api.its.service.atrd;
 
 import com.its.api.its.model.dto.atrd.TbAtrdDto;
 import com.its.api.its.model.dto.atrd.TbAtrdRoadRltnDto;
+import com.its.api.its.model.dto.common.UsageCountDto;
 import com.its.api.its.model.entity.atrd.TbAtrd;
 import com.its.api.its.model.entity.atrd.TbAtrdRoadRltn;
 import com.its.api.its.repository.atrd.TbAtrdRepository;
@@ -112,8 +113,12 @@ public class TbAtrdService {
      * @return
      */
     @Transactional(readOnly = true)
-    public Integer findUsageId(String id) {
+    public UsageCountDto findUsageId(String id) {
+        UsageCountDto result = UsageCountDto.builder()
+                .count(0)
+                .build();
         Integer data = this.repo.findUsageId(id);
-        return data;
+        result.setCount(data);
+        return result;
     }
 }

src/main/java/com/its/api/its/service/vms/TbVmsIfscService.java

@@ -1,6 +1,7 @@
 package com.its.api.its.service.vms;
 
 import com.its.api.its.model.dto.common.NewIdLongDto;
+import com.its.api.its.model.dto.common.UsageCountDto;
 import com.its.api.its.model.dto.vms.TbVmsIfscCmtrGradDto;
 import com.its.api.its.model.dto.vms.TbVmsIfscDto;
 import com.its.api.its.model.dto.vms.TbVmsLinkIfscDto;
@@ -131,8 +132,8 @@ public class TbVmsIfscService {
     // 정보 삭제-개별, 데이터 존재하지 않으면 Exception
     @Transactional
     public TbVmsIfscDto deleteById(Long id) {
-        int usageCount = findUsageCountByVmsIfscId(id);
-        if (usageCount > 0) {
+        UsageCountDto usageCount = findUsageCountByVmsIfscId(id);
+        if (usageCount.getCount() > 0) {
             throw new ConcurrentModificationException("사용중인 정보제공구간 입니다. 삭제할 수 없습니다: " + id);
         }
 
@@ -167,31 +168,37 @@ public class TbVmsIfscService {
 
     // VMS 정보 제공구간이 사용되는 갯수 리턴
     @Transactional(readOnly = true)
-    public Integer findUsageCountByVmsIfscId(Long vmsIfscId) {
+    public UsageCountDto findUsageCountByVmsIfscId(Long vmsIfscId) {
+        UsageCountDto result = UsageCountDto.builder()
+                .count(0)
+                .build();
         Integer useCount = 0;
 
         // TB_VMS_IFSC(VMS 정보제공구간), DETR_ID 에 설정되어 사용 중인지 확인.
         useCount = this.repo.findUsageCountByVmsIfscId(vmsIfscId);
         log.info("Usage TB_VMS_IFSC.DETR_ID: {}", useCount);
         if (useCount > 0) {
-            return 1;
+            result.setCount(1);
+            return result;
         }
 
         // TB_VMS_IFSC_RLTN(VMS 정보제공구간 관계) 설정 테이블에 사용 중인지 확인
         useCount = useCount + this.ifscRltnService.findUsageCountByVmsIfscId(vmsIfscId);
         log.info("Usage TB_VMS_IFSC_RLTN.VMS_IFSC_ID: {}", useCount);
         if (useCount > 0) {
-            return 2;
+            result.setCount(2);
+            return result;
         }
 
         // TB_VMS_FORM_OBJECT(VMS FORM OBJECT) 설정 테이블에 사용 중인지 확인
         useCount = this.formObjectService.findUsageCountByVmsIfscId(vmsIfscId);
         log.info("Usage TB_VMS_FORM_OBJECT.VMS_IFSC_ID: {}", useCount);
         if (useCount > 0) {
-            return 3;
+            result.setCount(3);
+            return result;
         }
 
-        return 0;
+        return result;
     }
 
     /**

src/main/java/com/its/api/its/service/vms/TbVmsSymbLibService.java

@@ -1,5 +1,7 @@
 package com.its.api.its.service.vms;
 
+import com.its.api.its.model.dto.common.NewIdIntegerDto;
+import com.its.api.its.model.dto.common.UsageCountDto;
 import com.its.api.its.model.dto.vms.TbVmsSymbLibDto;
 import com.its.api.its.model.entity.vms.TbVmsSymbLib;
 import com.its.api.its.repository.vms.TbVmsFormObjectRepository;
@@ -121,11 +123,21 @@ public class TbVmsSymbLibService {
         return result;
     }
 
-    public Integer findUsageCountBySymbolId(Integer id) {
-        return this.formObjectRepository.findUsageCountBySymbolId(id);
+    public UsageCountDto findUsageCountBySymbolId(Integer id) {
+        UsageCountDto result = UsageCountDto.builder()
+                .count(0)
+                .build();
+        Integer data = this.formObjectRepository.findUsageCountBySymbolId(id);
+        result.setCount(data);
+        return result;
     }
 
-    public Integer getNewSymbolId(Integer min_val, Integer max_val) {
-        return this.repo.getNewSymbolId(min_val, max_val);
+    public NewIdIntegerDto getNewSymbolId(Integer min_val, Integer max_val) {
+        NewIdIntegerDto result = NewIdIntegerDto.builder()
+                .newId(0)
+                .build();
+        Integer data = this.repo.getNewSymbolId(min_val, max_val);
+        result.setNewId(data);
+        return result;
     }
 }

src/main/java/com/its/api/its/service/vms/TbVmsSymbLibVmp0Service.java

@@ -1,5 +1,7 @@
 package com.its.api.its.service.vms;
 
+import com.its.api.its.model.dto.common.NewIdIntegerDto;
+import com.its.api.its.model.dto.common.UsageCountDto;
 import com.its.api.its.model.dto.vms.TbVmsSymbLibDto;
 import com.its.api.its.repository.vms.TbVmsFormObjectRepository;
 import com.its.api.its.repository.vms.TbVmsSymbLibRepository;
@@ -17,14 +19,14 @@ public class TbVmsSymbLibVmp0Service extends TbVmsSymbLibService {
         super("VMP0", repo, formObjectRepository);
     }
 
-    public Integer getNewSymbolId() {
+    public NewIdIntegerDto getNewSymbolId() {
         return getNewSymbolId(6000, 6999);
     }
 
     @Transactional
     public TbVmsSymbLibDto deleteDataById(Integer id) {
-        int usageCount = findUsageCountBySymbolId(id);
-        if (usageCount > 0) {
+        UsageCountDto usageCount = findUsageCountBySymbolId(id);
+        if (usageCount.getCount() > 0) {
             throw new ConcurrentModificationException("사용중인 심볼 라이브러리 입니다. 삭제할 수 없습니다: " + id);
         }
         return deleteById(id);

src/main/java/com/its/api/its/service/vms/TbVmsSymbLibVmp1Service.java

@@ -1,10 +1,12 @@
 package com.its.api.its.service.vms;
 
-import com.its.api.its.repository.vms.TbVmsFormObjectRepository;
+import com.its.api.its.model.dto.common.NewIdIntegerDto;
+import com.its.api.its.model.dto.common.UsageCountDto;
 import com.its.api.its.model.dto.vms.TbVmsSymbIfscDto;
 import com.its.api.its.model.dto.vms.TbVmsSymbLibDto;
 import com.its.api.its.model.dto.vms.TbVmsSymbLibIfscVMP1Dto;
 import com.its.api.its.model.entity.vms.TbVmsSymbLib;
+import com.its.api.its.repository.vms.TbVmsFormObjectRepository;
 import com.its.api.its.repository.vms.TbVmsSymbLibRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -25,7 +27,7 @@ public class TbVmsSymbLibVmp1Service extends TbVmsSymbLibService {
         this.ifscService = ifscService;
     }
 
-    public Integer getNewSymbolId() {
+    public NewIdIntegerDto getNewSymbolId() {
         return getNewSymbolId(7000, 7999);
     }
 
@@ -37,8 +39,8 @@ public class TbVmsSymbLibVmp1Service extends TbVmsSymbLibService {
 
     @Transactional
     public TbVmsSymbLibDto deleteDataById(Integer id) {
-        int usageCount = findUsageCountBySymbolId(id);
-        if (usageCount > 0) {
+        UsageCountDto usageCount = findUsageCountBySymbolId(id);
+        if (usageCount.getCount() > 0) {
             throw new ConcurrentModificationException("사용중인 소통정보 배경이미지 입니다. 삭제할 수 없습니다: " + id);
         }
         this.ifscService.deleteDataById(id);

src/main/java/com/its/api/its/service/vms/TbVmsSymbLibVmp2Service.java

@@ -1,12 +1,14 @@
 package com.its.api.its.service.vms;
 
-import com.its.api.its.repository.vms.TbVmsFormObjectRepository;
+import com.its.api.its.model.dto.common.NewIdIntegerDto;
+import com.its.api.its.model.dto.common.UsageCountDto;
 import com.its.api.its.model.dto.vms.TbVmsSymbIfscDto;
 import com.its.api.its.model.dto.vms.TbVmsSymbLibDto;
 import com.its.api.its.model.dto.vms.TbVmsSymbLibIfscVMP2Dto;
 import com.its.api.its.model.entity.vms.TbVmsSymbIfsc;
 import com.its.api.its.model.entity.vms.TbVmsSymbIfscKey;
 import com.its.api.its.model.entity.vms.TbVmsSymbLib;
+import com.its.api.its.repository.vms.TbVmsFormObjectRepository;
 import com.its.api.its.repository.vms.TbVmsSymbLibRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -25,7 +27,7 @@ public class TbVmsSymbLibVmp2Service extends TbVmsSymbLibService {
         this.ifscService = ifscService;
     }
 
-    public Integer getNewSymbolId() {
+    public NewIdIntegerDto getNewSymbolId() {
         return getNewSymbolId(8000, 8999);
     }
 
@@ -56,8 +58,8 @@ public class TbVmsSymbLibVmp2Service extends TbVmsSymbLibService {
 
     @Transactional
     public TbVmsSymbLibDto deleteDataById(Integer id) {
-        int usageCount = findUsageCountBySymbolId(id);
-        if (usageCount > 0) {
+        UsageCountDto usageCount = findUsageCountBySymbolId(id);
+        if (usageCount.getCount() > 0) {
             throw new ConcurrentModificationException("사용중인 소통정보 이미지 입니다. 삭제할 수 없습니다: " + id);
         }
         Integer cellId = 1;