dev

src/main/java/com/its/op/controller/its/facility/TbFcltFailOcrrTypeController.java

@@ -1,9 +1,11 @@
 package com.its.op.controller.its.facility;
 
+import com.its.op.dto.its.common.UsageCountDto;
 import com.its.op.dto.its.facility.TbFcltFailOcrrTypeDto;
 import com.its.op.service.its.facility.TbFcltFailOcrrTypeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -38,4 +40,12 @@ public class TbFcltFailOcrrTypeController {
         return this.service.mergeInfo(req);
     }
 
+    @ApiOperation(value = "ID 사용여부 조회(신규 아이디 만들때 사용)", response = UsageCountDto.class)
+    @GetMapping(value = "/usage/{id}", produces = {"application/json; charset=utf8"})
+    public UsageCountDto findUsageId(
+            @ApiParam(name = "id", value = "ID", example = "110", required = true)
+            @PathVariable final String id) {
+        return this.service.findUsageId(id);
+    }
+
 }

src/main/java/com/its/op/controller/its/facility/TbFcltFailStupController.java

@@ -1,5 +1,6 @@
 package com.its.op.controller.its.facility;
 
+import com.its.op.dto.its.facility.TbFcltCmpyDto;
 import com.its.op.dto.its.facility.TbFcltFailStupDto;
 import com.its.op.entity.its.facility.TbFcltFailStupKey;
 import com.its.op.service.its.facility.TbFcltFailStupService;
@@ -10,6 +11,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.List;
 
 @Api(tags = "01.시설물관리-0.코드관리-4.시설물 장애 처리 설정")
@@ -34,9 +36,21 @@ public class TbFcltFailStupController {
     }
 
     @ApiOperation(value = "시설물 장애 처리 설정 정보변경/생성-개별(TB_FCLT_FAIL_STUP)", response = TbFcltFailStupDto.class)
-    @PostMapping(value = "/{id}", produces = {"application/json; charset=utf8"})
-    public TbFcltFailStupDto mergeInfo(@PathVariable("id") TbFcltFailStupKey id, @RequestBody @Valid final TbFcltFailStupDto.TbFcltFailStupUpdReq req) {
+    @PostMapping(value = "/{fcltType}/{failOcrrCd}/{failCd}", produces = {"application/json; charset=utf8"})
+    public TbFcltFailStupDto mergeInfo(@PathVariable("fcltType") String fcltType, @PathVariable("failOcrrCd") String failOcrrCd, @PathVariable("failCd") String failCd,
+                                       @RequestBody @Valid final TbFcltFailStupDto.TbFcltFailStupUpdReq req) {
+        TbFcltFailStupKey key = new TbFcltFailStupKey(fcltType, failOcrrCd, failCd);
         return this.service.mergeInfo(req);
     }
 
+    @ApiOperation(value = "시설물 장애 처리 설정 정보변경 정보삭제-목록(TB_FCLT_FAIL_STUP)", response = TbFcltCmpyDto.class, responseContainer = "ArrayList")
+    @DeleteMapping(value = "/{fcltType}/{failOcrrCd}/{failCd}", produces = {"application/json; charset=utf8"})
+    public List<TbFcltFailStupDto> deleteDataById(@PathVariable("fcltType") String fcltType, @PathVariable("failOcrrCd") String failOcrrCd, @PathVariable("failCd") String failCd) {
+        TbFcltFailStupKey key = new TbFcltFailStupKey(fcltType, failOcrrCd, failCd);
+        List<TbFcltFailStupKey> ids = new ArrayList<>();
+        ids.add(key);
+        return this.service.deleteByIds(ids);
+    }
+
+
 }

src/main/java/com/its/op/controller/its/facility/TbFcltFailTypeActController.java

@@ -1,9 +1,11 @@
 package com.its.op.controller.its.facility;
 
+import com.its.op.dto.its.common.UsageCountDto;
 import com.its.op.dto.its.facility.TbFcltFailTypeActDto;
 import com.its.op.service.its.facility.TbFcltFailTypeActService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -38,4 +40,12 @@ public class TbFcltFailTypeActController {
         return this.service.mergeInfo(req);
     }
 
+    @ApiOperation(value = "ID 사용여부 조회(신규 아이디 만들때 사용)", response = UsageCountDto.class)
+    @GetMapping(value = "/usage/{id}", produces = {"application/json; charset=utf8"})
+    public UsageCountDto findUsageId(
+            @ApiParam(name = "id", value = "ID", example = "110", required = true)
+            @PathVariable final String id) {
+        return this.service.findUsageId(id);
+    }
+
 }

src/main/java/com/its/op/controller/its/facility/TbFcltFailTypeController.java

@@ -1,9 +1,11 @@
 package com.its.op.controller.its.facility;
 
+import com.its.op.dto.its.common.UsageCountDto;
 import com.its.op.dto.its.facility.TbFcltFailTypeDto;
 import com.its.op.service.its.facility.TbFcltFailTypeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -38,4 +40,12 @@ public class TbFcltFailTypeController {
         return this.service.mergeInfo(req);
     }
 
+    @ApiOperation(value = "ID 사용여부 조회(신규 아이디 만들때 사용)", response = UsageCountDto.class)
+    @GetMapping(value = "/usage/{id}", produces = {"application/json; charset=utf8"})
+    public UsageCountDto findUsageId(
+            @ApiParam(name = "id", value = "ID", example = "110", required = true)
+            @PathVariable final String id) {
+        return this.service.findUsageId(id);
+    }
+
 }

src/main/java/com/its/op/dao/repository/its/facility/TbFcltFailOcrrTypeRepository.java

@@ -4,6 +4,7 @@ import com.its.op.entity.its.facility.TbFcltFailOcrrType;
 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;
@@ -14,7 +15,10 @@ public interface TbFcltFailOcrrTypeRepository extends JpaRepository<TbFcltFailOc
     @Query("select p from TbFcltFailOcrrType p")
     List<TbFcltFailOcrrType> findAll();
 
-    @Query("select p from TbFcltFailOcrrType p")
+    @Query("select p from TbFcltFailOcrrType p where p.useYn = 'Y'")
     List<TbFcltFailOcrrType> findAllList();
 
+    @Query("select count(p.failOcrrCd) from TbFcltFailOcrrType p where p.failOcrrCd = :failOcrrCd")
+    Integer findUsageId(@Param("failOcrrCd") String failOcrrCd);
+
 }

src/main/java/com/its/op/dao/repository/its/facility/TbFcltFailStupRepository.java

@@ -15,7 +15,7 @@ public interface TbFcltFailStupRepository extends JpaRepository<TbFcltFailStup,
     @Query("select p from TbFcltFailStup p")
     List<TbFcltFailStup> findAll();
 
-    @Query("select p from TbFcltFailStup p")
+    @Query("select p from TbFcltFailStup p where p.useYn = 'Y'")
     List<TbFcltFailStup> findAllList();
 
 }

src/main/java/com/its/op/dao/repository/its/facility/TbFcltFailTypeActRepository.java

@@ -4,6 +4,7 @@ import com.its.op.entity.its.facility.TbFcltFailTypeAct;
 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;
@@ -14,7 +15,10 @@ public interface TbFcltFailTypeActRepository extends JpaRepository<TbFcltFailTyp
     @Query("select p from TbFcltFailTypeAct p")
     List<TbFcltFailTypeAct> findAll();
 
-    @Query("select p from TbFcltFailTypeAct p")
+    @Query("select p from TbFcltFailTypeAct p where p.useYn = 'Y'")
     List<TbFcltFailTypeAct> findAllList();
 
+    @Query("select count(p.failActCd) from TbFcltFailTypeAct p where p.failActCd = :failActCd")
+    Integer findUsageId(@Param("failActCd") String failActCd);
+
 }

src/main/java/com/its/op/dao/repository/its/facility/TbFcltFailTypeRepository.java

@@ -4,6 +4,7 @@ import com.its.op.entity.its.facility.TbFcltFailType;
 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;
@@ -14,7 +15,10 @@ public interface TbFcltFailTypeRepository extends JpaRepository<TbFcltFailType,
     @Query("select p from TbFcltFailType p")
     List<TbFcltFailType> findAll();
 
-    @Query("select p from TbFcltFailType p")
+    @Query("select p from TbFcltFailType p where p.useYn = 'Y'")
     List<TbFcltFailType> findAllList();
 
+    @Query("select count(p.failCd) from TbFcltFailType p where p.failCd = :failCd")
+    Integer findUsageId(@Param("failCd") String failCd);
+
 }

src/main/java/com/its/op/service/its/facility/TbFcltFailOcrrTypeService.java

@@ -1,6 +1,7 @@
 package com.its.op.service.its.facility;
 
 import com.its.op.dao.repository.its.facility.TbFcltFailOcrrTypeRepository;
+import com.its.op.dto.its.common.UsageCountDto;
 import com.its.op.dto.its.facility.TbFcltFailOcrrTypeDto;
 import com.its.op.entity.its.facility.TbFcltFailOcrrType;
 import com.its.op.global.CmmnFcltCdManager;
@@ -64,4 +65,14 @@ public class TbFcltFailOcrrTypeService {
         return result;
     }
 
+    @Transactional(readOnly = true)
+    public UsageCountDto findUsageId(String id) {
+        UsageCountDto result = UsageCountDto.builder()
+                .count(0)
+                .build();
+        Integer data = this.repo.findUsageId(id);
+        result.setCount(data);
+        return result;
+    }
+
 }

src/main/java/com/its/op/service/its/facility/TbFcltFailStupService.java

@@ -58,4 +58,17 @@ public class TbFcltFailStupService {
         return obj.toDto();
     }
 
+    // 정보 삭제-목록, 존재하는 데이터 만 삭제
+    public List<TbFcltFailStupDto> deleteByIds(List<TbFcltFailStupKey> ids) {
+        List<TbFcltFailStupDto> result = new ArrayList<>();
+        for (TbFcltFailStupKey id : ids) {
+            Optional<TbFcltFailStup> obj = this.repo.findById(id);
+            if (obj.isPresent()) {
+                this.repo.deleteById(id);
+                result.add(obj.get().toDto());
+            }
+        }
+        return result;
+    }
+
 }

src/main/java/com/its/op/service/its/facility/TbFcltFailTypeActService.java

@@ -1,6 +1,7 @@
 package com.its.op.service.its.facility;
 
 import com.its.op.dao.repository.its.facility.TbFcltFailTypeActRepository;
+import com.its.op.dto.its.common.UsageCountDto;
 import com.its.op.dto.its.facility.TbFcltFailTypeActDto;
 import com.its.op.entity.its.facility.TbFcltFailTypeAct;
 import com.its.op.global.CmmnFcltCdManager;
@@ -64,4 +65,14 @@ public class TbFcltFailTypeActService {
         return result;
     }
 
+    @Transactional(readOnly = true)
+    public UsageCountDto findUsageId(String id) {
+        UsageCountDto result = UsageCountDto.builder()
+                .count(0)
+                .build();
+        Integer data = this.repo.findUsageId(id);
+        result.setCount(data);
+        return result;
+    }
+
 }

src/main/java/com/its/op/service/its/facility/TbFcltFailTypeService.java

@@ -1,6 +1,7 @@
 package com.its.op.service.its.facility;
 
 import com.its.op.dao.repository.its.facility.TbFcltFailTypeRepository;
+import com.its.op.dto.its.common.UsageCountDto;
 import com.its.op.dto.its.facility.TbFcltFailTypeDto;
 import com.its.op.entity.its.facility.TbFcltFailType;
 import com.its.op.global.CmmnFcltCdManager;
@@ -64,4 +65,14 @@ public class TbFcltFailTypeService {
         return result;
     }
 
+    @Transactional(readOnly = true)
+    public UsageCountDto findUsageId(String id) {
+        UsageCountDto result = UsageCountDto.builder()
+                .count(0)
+                .build();
+        Integer data = this.repo.findUsageId(id);
+        result.setCount(data);
+        return result;
+    }
+
 }

src/main/java/com/its/op/service/its/oper/TbUserInfrService.java

@@ -214,4 +214,5 @@ public class TbUserInfrService {
         result.setCount(data);
         return result;
     }
+
 }