fail act

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

@@ -36,25 +36,26 @@ public class TbFcltFailActController {
 
     @ApiOperation(value = "시설물 장애 발생 조치 정보 목록조회(TB_FCLT_FAIL_ACT)", response = TbFcltFailActDto.class)
     @GetMapping(value = "/{failNo}", produces = {"application/json; charset=utf8"})
-    public List<TbFcltFailActDto> findActListByFailNo(@PathVariable("failNo") final Long failNo) {
+    public List<TbFcltFailActDto> findActListByFailNo(@PathVariable("failNo") final String failNo) {
         return this.service.findActListByFailNo(failNo);
     }
 
     @ApiOperation(value = "시설물 장애 발생 조치 정보 정보변경/생성-개별(TB_FCLT_FAIL_ACT)", response = TbFcltFailActDto.class)
-    @PostMapping(value = "/{key}", produces = {"application/json; charset=utf8"})
-    public TbFcltFailActDto mergeInfo(@PathVariable("key") final TbFcltFailActKey key, @RequestBody @Valid final TbFcltFailActDto.TbFcltFailActUpdReq req) {
+    @PostMapping(value = "", produces = {"application/json; charset=utf8"})
+    public TbFcltFailActDto mergeInfo(@RequestBody @Valid final TbFcltFailActDto.TbFcltFailActUpdReq req) {
         return this.service.mergeInfo(req);
     }
 
     @ApiOperation(value = "시설물 장애 발생 조치 정보 정보삭제-개별(TB_FCLT_FAIL_ACT)", response = TbFcltFailActDto.class)
-    @DeleteMapping(value = "/{failNo}", produces = {"application/json; charset=utf8"})
-    public TbFcltFailActDto deleteDataById(@PathVariable("failNo") final TbFcltFailActKey failNo) {
-        return this.service.deleteById(failNo);
+    @DeleteMapping(value = "/{failNo}/{actSeq}", produces = {"application/json; charset=utf8"})
+    public TbFcltFailActDto deleteDataById(@PathVariable("failNo") final String failNo, @PathVariable("actSeq") final Integer actSeq) {
+        TbFcltFailActKey key = new TbFcltFailActKey(failNo, actSeq);
+        return this.service.deleteById(key);
     }
 
     @ApiOperation(value = "신규 ACT SEQ 조회", response = NewIdLongDto.class)
     @GetMapping(value = "/new-id/act-eeq/{failNo}", produces = {"application/json; charset=utf8"})
-    public NewIdLongDto getNewActSeq(@PathVariable("failNo") final Long failNo) {
+    public NewIdLongDto getNewActSeq(@PathVariable("failNo") final String failNo) {
         return this.service.getNewActSeq(failNo);
     }
 

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

@@ -20,9 +20,9 @@ public interface TbFcltFailActRepository extends JpaRepository<TbFcltFailAct, Tb
     List<TbFcltFailAct> findAllList();
 
     @Query(value = "SELECT NVL(MAX(ACT_SEQ), 0) + 1 AS NEWID FROM TB_FCLT_FAIL_ACT WHERE FAIL_NO = :failNo", nativeQuery = true)
-    Long getNewActSeq(@Param("failNo") Long failNo);
+    Long getNewActSeq(@Param("failNo") String failNo);
 
     @Query("select p from TbFcltFailAct p where p.failNo = :failNo")
-    List<TbFcltFailAct> findActListByFailNo(@Param("failNo") Long failNo);
+    List<TbFcltFailAct> findActListByFailNo(@Param("failNo") String failNo);
 
 }

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

@@ -80,13 +80,13 @@ public class TbFcltFailActService {
     }
 
     @Transactional(readOnly = true)
-    public NewIdLongDto getNewActSeq(Long failNo) {
+    public NewIdLongDto getNewActSeq(String failNo) {
         Long newId = this.repo.getNewActSeq(failNo);
         return NewIdLongDto.builder().newId(newId).build();
     }
 
     @Transactional(readOnly = true)
-    public List<TbFcltFailActDto> findActListByFailNo(Long failNo) {
+    public List<TbFcltFailActDto> findActListByFailNo(String failNo) {
         List<TbFcltFailActDto> result = new ArrayList<>();
         List<TbFcltFailAct> data = this.repo.findActListByFailNo(failNo);
         for (TbFcltFailAct entity : data) {