update del_yn true, when data deleted

src/main/java/com/its/op/controller/its/cctv/TbCctvCtlrController.java

@@ -24,8 +24,8 @@ public class TbCctvCtlrController {
 
     @ApiOperation(value = "CCTV 제어기 전체조회(TB_CCTV_CTLR)", response = TbCctvCtlrDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "", produces = {"application/json; charset=utf8"})
-    public List<TbCctvCtlrDto> findAll() {
-        return service.findAll();
+    public List<TbCctvCtlrDto> findAllList() {
+        return service.findAllList();
     }
 
     @ApiOperation(value = "CCTV 제어기 개별조회(TB_CCTV_CTLR)", response = TbCctvCtlrDto.class)

src/main/java/com/its/op/controller/its/vds/TbVdsCtlrController.java

@@ -23,8 +23,8 @@ public class TbVdsCtlrController {
 
     @ApiOperation(value = "VDS 제어기 전체조회(TB_VDS_CTLR)", response = TbVdsCtlrDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "", produces = {"application/json; charset=utf8"})
-    public List<TbVdsCtlrDto> findAll() {
-        return service.findAll();
+    public List<TbVdsCtlrDto> findAllList() {
+        return service.findAllList();
     }
 
     @ApiOperation(value = "VDS 제어기 개별조회(TB_VDS_CTLR)", response = TbVdsCtlrDto.class)

src/main/java/com/its/op/controller/its/vds/TbVdsDtctController.java

@@ -23,8 +23,8 @@ public class TbVdsDtctController {
 
     @ApiOperation(value = "VDS 검지기 마스터 전체조회(TB_VDS_DTCT_MSTR)", response = TbVdsDtctDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "", produces = {"application/json; charset=utf8"})
-    public List<TbVdsDtctDto> findAll() {
-        return service.findAll();
+    public List<TbVdsDtctDto> findAllList() {
+        return service.findAllList();
     }
 
     @ApiOperation(value = "VDS 검지기 마스터 개별조회(TB_VDS_DTCT_MSTR)", response = TbVdsDtctDto.class)

src/main/java/com/its/op/controller/its/vms/TbVmsCtlrController.java

@@ -24,8 +24,8 @@ public class TbVmsCtlrController {
 
     @ApiOperation(value = "VMS 제어기 전체조회(TB_VMS_CTLR)", response = TbVmsCtlrDto.class)
     @GetMapping(value = "", produces = {"application/json; charset=utf8"})
-    public List<TbVmsCtlrDto> findAll() {
-        return service.findAll();
+    public List<TbVmsCtlrDto> findAllList() {
+        return service.findAllList();
     }
 
     @ApiOperation(value = "VMS 제어기 개별조회(TB_VMS_CTLR)", response = TbVmsCtlrDto.class)

src/main/java/com/its/op/dao/repository/its/vds/TbVdsDtctRepository.java

@@ -14,4 +14,6 @@ public interface TbVdsDtctRepository extends JpaRepository<TbVdsDtct, String>, J
     @Query("select p from TbVdsDtct p inner join fetch p.vds left outer join p.link link")
     List<TbVdsDtct> findAll();
 
+    @Query("select p from TbVdsDtct p inner join fetch p.vds left outer join p.link link where p.delYn = 'N'")
+    List<TbVdsDtct> findAllList();
 }

src/main/java/com/its/op/entity/its/cctv/TbCctvCtlr.java

@@ -177,6 +177,10 @@ public class TbCctvCtlr implements Serializable {
     @NotFound(action = NotFoundAction.IGNORE)
     private TbCctvStts state = new TbCctvStts();
 
+    public void setDelete() {
+        this.delYn = "Y";
+    }
+
     public TbCctvCtlrDto toDto() {
         return TbCctvCtlrDto.builder()
                 .cctvMngmNmbr(this.cctvMngmNmbr)

src/main/java/com/its/op/entity/its/vds/TbVdsCtlr.java

@@ -108,6 +108,10 @@ public class TbVdsCtlr implements Serializable {
     @NotFound(action = NotFoundAction.IGNORE)
     private TbVdsCtlrStts state = new TbVdsCtlrStts();
 
+    public void setDelete() {
+        this.delYn = "Y";
+    }
+
     public TbVdsCtlrDto toDto() {
         return TbVdsCtlrDto.builder()
                 .ctlrMngmNmbr(this.ctlrMngmNmbr)

src/main/java/com/its/op/entity/its/vds/TbVdsDtct.java

@@ -134,12 +134,15 @@ public class TbVdsDtct implements Serializable {
     @NotFound(action = NotFoundAction.IGNORE)
     private TbVdsCtlr vds = new TbVdsCtlr();
 
-
     @OneToOne
     @JoinColumn(insertable=false, updatable=false, name="DTCT_NMBR", referencedColumnName = "DTCT_NMBR")
     @NotFound(action = NotFoundAction.IGNORE)
     private TbVdsDtctLinkRltn link = new TbVdsDtctLinkRltn();
 
+    public void setDelete() {
+        this.delYn = "Y";
+    }
+
     public TbVdsDtctDto toDto() {
         TbVdsDtctDto dto = TbVdsDtctDto.builder()
                 .dtctNmbr(this.dtctNmbr)

src/main/java/com/its/op/entity/its/vms/TbVmsCtlr.java

@@ -223,6 +223,10 @@ public class TbVmsCtlr implements Serializable {
     @NotFound(action = NotFoundAction.IGNORE)
     private TbVmsStts state = new TbVmsStts();
 
+    public void setDelete() {
+        this.delYn = "Y";
+    }
+
     public TbVmsCtlrDto toDto() {
         TbVmsCtlrDto dto = TbVmsCtlrDto.builder()
                 .vmsCtlrNmbr(this.vmsCtlrNmbr)

src/main/java/com/its/op/service/its/cctv/TbCctvCtlrService.java

@@ -56,11 +56,11 @@ public class TbCctvCtlrService {
     public List<TbCctvCtlrDto> findAllList() {
         List<TbCctvCtlrDto> result = new ArrayList<>();
         List<TbCctvCtlr> data = this.repo.findAllList();
-        for (TbCctvCtlr entity : data) {
-            if (("N").equals(entity.getDelYn())) {
-                result.add(entity.toDto());
-            }
-        }
+        data.forEach(obj -> {
+            //if (("N").equals(entity.getDelYn())) {
+            result.add(obj.toDto());
+            //}
+        });
         return result;
     }
 
@@ -98,7 +98,9 @@ public class TbCctvCtlrService {
     @Transactional
     public TbCctvCtlrDto deleteById(Long id) {
         TbCctvCtlr entity = requireOne(id);
-        this.repo.deleteById(id);
+        entity.setDelete();
+        //this.repo.deleteById(id);
+        this.repo.save(entity);
         return entity.toDto();
     }
 

src/main/java/com/its/op/service/its/vds/TbVdsCtlrService.java

@@ -45,7 +45,9 @@ public class TbVdsCtlrService {
         List<TbVdsCtlrDto> result = new ArrayList<>();
         List<TbVdsCtlr> data = this.repo.findAll();
         for (TbVdsCtlr entity : data) {
-            result.add(entity.toDto());
+            if (entity.getDelYn() != null && entity.getDelYn().equals("N")) {
+                result.add(entity.toDto());
+            }
         }
         return result;
     }
@@ -128,7 +130,9 @@ public class TbVdsCtlrService {
     @Transactional
     public TbVdsCtlrDto deleteById(String id) {
         TbVdsCtlr entity = requireOne(id);
-        this.repo.deleteById(id);
+        entity.setDelete();
+        //this.repo.deleteById(id);
+        this.repo.save(entity);
         return entity.toDto();
     }
 

src/main/java/com/its/op/service/its/vds/TbVdsDtctService.java

@@ -52,6 +52,20 @@ public class TbVdsDtctService {
         return result;
     }
 
+    /**
+     * 삭제되지 않은 전체 VMS 목록 조회
+     * @return
+     */
+    @Transactional(readOnly = true)
+    public List<TbVdsDtctDto> findAllList() {
+        List<TbVdsDtctDto> result = new ArrayList<>();
+        List<TbVdsDtct> data = this.repo.findAllList();
+        data.forEach(obj -> {
+            result.add(obj.toDto());
+        });
+        return result;
+    }
+
     // 데이터 1건 조회(기존 데이터가 반드시 존재해야 함)
     @Transactional(readOnly = true)
     public TbVdsDtctDto findById(String id) {
@@ -127,7 +141,9 @@ public class TbVdsDtctService {
         // 검지기 링크 관계설정 정보 삭제
         this.linkRltnRepo.deleteById(id);
         // 검지기 마스터 정보 삭제
-        this.repo.deleteById(id);
+        entity.setDelete();
+        //this.repo.deleteById(id);
+        this.repo.save(entity);
         return entity.toDto();
     }
 

src/main/java/com/its/op/service/its/vms/TbVmsCtlrService.java

@@ -54,7 +54,9 @@ public class TbVmsCtlrService {
         List<TbVmsCtlrDto> result = new ArrayList<>();
         List<TbVmsCtlr> data = this.repo.findAll();
         for (TbVmsCtlr entity : data) {
-            result.add(entity.toDto());
+            if (entity.getDelYn() != null && entity.getDelYn().equals("N")) {
+                result.add(entity.toDto());
+            }
         }
         return result;
     }
@@ -174,23 +176,12 @@ public class TbVmsCtlrService {
     // 정보 삭제-개별, 데이터 존재하지 않으면 Exception
     public TbVmsCtlrDto deleteById(Long id) {
         TbVmsCtlr entity = requireOne(id);
-        this.repo.deleteById(id);
+        entity.setDelete();
+        //this.repo.deleteById(id);
+        this.repo.save(entity);
         return entity.toDto();
     }
 
-    // 정보 삭제-목록, 존재하는 데이터 만 삭제
-    public List<TbVmsCtlrDto> deleteByIds(List<Long> ids) {
-        List<TbVmsCtlrDto> result = new ArrayList<>();
-        for (Long id : ids) {
-            Optional<TbVmsCtlr> obj = this.repo.findById(id);
-            if (obj.isPresent()) {
-                this.repo.deleteById(id);
-                result.add(obj.get().toDto());
-            }
-        }
-        return result;
-    }
-
     /**
      * VMS 용도 유형 코드 조회
      * @return