ddd

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

@@ -1,6 +1,7 @@
 package com.its.op.controller.its.facility;
 
 import com.its.op.dto.its.common.NewIdStringDto;
+import com.its.op.dto.its.common.UsageCountDto;
 import com.its.op.dto.its.facility.*;
 import com.its.op.service.its.facility.TbFcltFailService;
 import io.swagger.annotations.Api;
@@ -57,14 +58,14 @@ public class TbFcltFailController {
         return this.service.findAllList();
     }
 
-    @ApiOperation(value = "시설물 장애 현황 조회", response = TbFcltFailDto.class, responseContainer = "ArrayList")
+    @ApiOperation(value = "시설물 장애 현황 조회(완료항목 포함)", response = TbFcltFailDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/list/all/{fromDay}/{toDay}", produces = {"application/json; charset=utf8"})
     public List<TbFcltFailDto> findAllListByDate(@PathVariable("fromDay") final String fromDay,
                                                  @PathVariable("toDay") final String toDay) {
         return this.service.findAllListByDate(true, fromDay, toDay);
     }
 
-    @ApiOperation(value = "시설물 장애 관리 목록 조회", response = TbFcltFailDto.class, responseContainer = "ArrayList")
+    @ApiOperation(value = "시설물 장애 관리 목록 조회(완료항목제외)", response = TbFcltFailDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/list/mng/{fromDay}/{toDay}", produces = {"application/json; charset=utf8"})
     public List<TbFcltFailDto> findRegListByDate(@PathVariable("fromDay") final String fromDay,
                                                  @PathVariable("toDay") final String toDay) {
@@ -83,6 +84,12 @@ public class TbFcltFailController {
         return this.service.mergeInfo(req);
     }
 
+    @ApiOperation(value = "조치내역 존재 여부 조회", response = UsageCountDto.class)
+    @GetMapping(value = "/usage/{failNo}", produces = {"application/json; charset=utf8"})
+    public UsageCountDto findUsageId(@PathVariable("failNo") final String failNo) {
+        return this.service.findUsageId(failNo);
+    }
+
     @ApiOperation(value = "시설물 장애 발생 정보 정보삭제-개별(TB_FCLT_FAIL)", response = TbFcltFailDto.class)
     @DeleteMapping(value = "/{failNo}", produces = {"application/json; charset=utf8"})
     public TbFcltFailDto deleteDataById(@PathVariable("failNo") final String failNo) {

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

@@ -25,4 +25,7 @@ public interface TbFcltFailActRepository extends JpaRepository<TbFcltFailAct, Tb
     @Query("select p from TbFcltFailAct p where p.failNo = :failNo")
     List<TbFcltFailAct> findActListByFailNo(@Param("failNo") String failNo);
 
+    @Query("select count(p.failNo) from TbFcltFailAct p where p.failNo = :failNo")
+    Integer findUsageCountById(String failNo);
+
 }

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

@@ -1,8 +1,10 @@
 package com.its.op.service.its.facility;
 
 import com.its.op.dao.repository.its.code.TbCmmnCdRepository;
+import com.its.op.dao.repository.its.facility.TbFcltFailActRepository;
 import com.its.op.dao.repository.its.facility.TbFcltFailRepository;
 import com.its.op.dto.its.common.NewIdStringDto;
+import com.its.op.dto.its.common.UsageCountDto;
 import com.its.op.dto.its.facility.*;
 import com.its.op.entity.its.code.TbCmmnCd;
 import com.its.op.entity.its.facility.TbFcltFail;
@@ -23,6 +25,7 @@ import java.util.Optional;
 public class TbFcltFailService {
 
     private final TbFcltFailRepository repo;
+    private final TbFcltFailActRepository actRepo;
     private final TbCmmnCdRepository cmmnCdRepo;
 
     // 데이터 1건 조회, 없으면 exception
@@ -68,6 +71,9 @@ public class TbFcltFailService {
     // 데이터 변경 또는 생성-개별(데이터가 존재하면 업데이트 없으면 신규로 생성)
     @Transactional
     public TbFcltFailDto mergeInfo(TbFcltFailDto.TbFcltFailUpdReq req) {
+        if (req.getStepCd() == null) {
+            req.setStepCd("ACT0");
+        }
         TbFcltFail obj = req.toEntity();
         this.repo.save(obj);
         return obj.toDto();
@@ -185,4 +191,13 @@ public class TbFcltFailService {
         }
         return result;
     }
+
+    public UsageCountDto findUsageId(String failNo) {
+        UsageCountDto result = UsageCountDto.builder()
+                .count(0)
+                .build();
+        Integer data = this.actRepo.findUsageCountById(failNo);
+        result.setCount(data);
+        return result;
+    }
 }

src/main/resources/application.yml

@@ -25,7 +25,7 @@ application:
     db-svr-stts: false
 
 server:
-  port: 8998
+  port: 80
   shutdown: graceful
   error:
     whitelabel: