shjung il y a 2 ans
Parent
commit
8f22f2fe52

+ 4 - 3
src/main/java/com/its/op/controller/its/scrs/TbScIxrCmraMngmController.java

@@ -58,9 +58,10 @@ public class TbScIxrCmraMngmController {
     }
 
     @ApiOperation(value = "카메라 관리 정보삭제-개별(TB_SC_IXR_CMRA_MNGM)", response = TbScIxrCmraMngmDto.class)
-    @DeleteMapping(value = "/{ixrId}", produces = {"application/json; charset=utf8"})
-    public TbScIxrCmraMngmDto deleteDataById(@PathVariable("ixrId") final TbScIxrCmraMngmKey ixrId) {
-        return this.service.deleteById(ixrId);
+    @DeleteMapping(value = "/{ixrId}/{cmraId}/{drctDvsnCd}", produces = {"application/json; charset=utf8"})
+    public TbScIxrCmraMngmDto deleteDataById(@PathVariable("ixrId") final String ixrId, @PathVariable("cmraId") final String cmraId, @PathVariable("drctDvsnCd") final Integer drctDvsnCd) {
+        TbScIxrCmraMngmKey ixrKey = new TbScIxrCmraMngmKey(ixrId, cmraId, drctDvsnCd);
+        return this.service.deleteById(ixrKey);
     }
 
     @ApiOperation(value = "카메라 관리 정보삭제-목록(TB_SC_IXR_CMRA_MNGM)", response = TbScIxrCmraMngmDto.class, responseContainer = "ArrayList")

+ 1 - 1
src/main/java/com/its/op/dao/repository/its/scrs/TbScIxrCmraMngmRepository.java

@@ -16,7 +16,7 @@ public interface TbScIxrCmraMngmRepository extends JpaRepository<TbScIxrCmraMngm
     @Query("select p from TbScIxrCmraMngm p left outer join fetch p.state state ")
     List<TbScIxrCmraMngm> findAll();
 
-    @Query("select p from TbScIxrCmraMngm p left outer join fetch p.state state ")
+    @Query("select p from TbScIxrCmraMngm p left outer join fetch p.state state where p.useEn = 1")
     List<TbScIxrCmraMngm> findAllList();
 
     @Query("select p from TbScIxrCmraMngm p where p.ixrId = :ixrId")

+ 7 - 0
src/main/java/com/its/op/entity/its/scrs/TbScIxrCmraMngm.java

@@ -146,6 +146,13 @@ public class TbScIxrCmraMngm implements Serializable {
     @NotFound(action = NotFoundAction.IGNORE)
     private TbScIxrCmraStts state;
 
+    public void setDelete(boolean delete) {
+        if (delete) {
+            this.useEn = 0;
+        } else {
+            this.useEn = 1;
+        }
+    }
     public String getCmncSttsCd() {
         String result = "CMS1";
         if (this.state != null) {

+ 8 - 0
src/main/java/com/its/op/service/ResourceMonitoringService.java

@@ -16,6 +16,14 @@ public class ResourceMonitoringService {
     private final Map<String, Set<Thread>> threadMap = new HashMap<String, Set<Thread>>();
 
     private Set<Thread> getActiveThreadSet() {
+        //ThreadUtils.getAllThreads()
+        /*
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.10</version>
+        </dependency>
+        */
         Set<Thread> activeThreads = Thread.getAllStackTraces().keySet();
         for (Thread t : activeThreads) {
             log.info("{}", t);

+ 3 - 1
src/main/java/com/its/op/service/its/scrs/TbScIxrCmraMngmService.java

@@ -104,7 +104,9 @@ public class TbScIxrCmraMngmService {
     @Transactional
     public TbScIxrCmraMngmDto deleteById(TbScIxrCmraMngmKey ixrId) {
         TbScIxrCmraMngm entity = requireOne(ixrId);
-        this.repo.deleteById(ixrId);
+        entity.setDelete(true);
+        this.repo.save(entity);
+        //this.repo.deleteById(ixrId);
         return entity.toDto();
     }