shjung 2 gadi atpakaļ
vecāks
revīzija
c05ebc75f0

+ 3 - 2
src/main/java/com/its/op/controller/its/facility/TbFcltInfrController.java

@@ -1,6 +1,7 @@
 package com.its.op.controller.its.facility;
 
 import com.its.op.dto.its.common.NewIdLongDto;
+import com.its.op.dto.its.common.NewIdStringDto;
 import com.its.op.dto.its.facility.FcltWorkStepDto;
 import com.its.op.dto.its.facility.TbFcltInfrDto;
 import com.its.op.dto.its.facility.UnRegisteredFcltInfrDto;
@@ -97,9 +98,9 @@ public class TbFcltInfrController {
         return this.service.getNewNmbr();
     }
 
-    @ApiOperation(value = "신규 시설물 ID 조회", response = NewIdLongDto.class)
+    @ApiOperation(value = "신규 시설물 ID 조회", response = NewIdStringDto.class)
     @GetMapping(value = "/fclt/new-id/{type}", produces = {"application/json; charset=utf8"})
-    public NewIdLongDto getNewFcltId(@PathVariable("type") String type) {
+    public NewIdStringDto getNewFcltId(@PathVariable("type") String type) {
         return this.service.getNewFcltId(type);
     }
 

+ 1 - 1
src/main/java/com/its/op/dao/repository/its/facility/TbFcltInfrRepository.java

@@ -40,6 +40,6 @@ public interface TbFcltInfrRepository extends JpaRepository<TbFcltInfr, Long>, J
     Long getNewNmbr();
 
     @Query(value = "SELECT :fcltType || LPAD(NVL(MAX(SUBSTR(FCLT_ID, -4)), '0000') + 1, 4, '0') AS NEWID FROM TB_FCLT_INFR WHERE FCLT_TYPE = :fcltType", nativeQuery = true)
-    Long getNewFcltId(@Param("fcltType") String fcltType);
+    String getNewFcltId(@Param("fcltType") String fcltType);
 
 }

+ 4 - 3
src/main/java/com/its/op/service/its/facility/TbFcltInfrService.java

@@ -4,6 +4,7 @@ import com.its.op.dao.repository.its.code.TbCmmnCdRepository;
 import com.its.op.dao.repository.its.facility.TbFcltInfrRepository;
 import com.its.op.dto.its.cctv.TbCctvCtlrDto;
 import com.its.op.dto.its.common.NewIdLongDto;
+import com.its.op.dto.its.common.NewIdStringDto;
 import com.its.op.dto.its.facility.FcltWorkStepDto;
 import com.its.op.dto.its.facility.TbFcltInfrDto;
 import com.its.op.dto.its.facility.UnRegisteredFcltInfrDto;
@@ -331,8 +332,8 @@ public class TbFcltInfrService {
      * @return
      */
     @Transactional(readOnly = true)
-    public NewIdLongDto getNewFcltId(String fcltType) {
-        Long newId = this.repo.getNewFcltId(fcltType);
-        return NewIdLongDto.builder().newId(newId).build();
+    public NewIdStringDto getNewFcltId(String fcltType) {
+        String newId = this.repo.getNewFcltId(fcltType);
+        return NewIdStringDto.builder().newId(newId).build();
     }
 }