Merge pull request #85 from kookmin-sw/backend

hyni03 · web-flow · commit d900d3e06bb9 · 2025-03-29T16:36:34.000+09:00
[Backend] merge: SSE API 연동
diff --git a/backend/src/main/java/com/example/backend/dashboard/controller/CaseDetectController.java b/backend/src/main/java/com/example/backend/dashboard/controller/CaseDetectController.java
@@ -0,0 +1,32 @@
+package com.example.backend.dashboard.controller;
+
+import com.example.backend.dashboard.dto.CaseDetectRequest;
+import com.example.backend.dashboard.dto.CaseDetectResponse;
+import com.example.backend.dashboard.service.CaseDetectService;
+import com.example.backend.dashboard.service.SseEmitterService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+@RestController
+@RequestMapping("/api/v1/case")
+@RequiredArgsConstructor
+public class CaseDetectController {
+
+    private final CaseDetectService caseDetectService;
+    private final SseEmitterService sseEmitterService;
+
+    @PostMapping("/detect")
+    public ResponseEntity<?> detectAlarm(@RequestBody CaseDetectRequest request) {
+        CaseDetectResponse response = caseDetectService.saveCase(request);
+        sseEmitterService.broadcast(response);
+        return ResponseEntity.ok(response);
+    }
+
+    @GetMapping("/subscribe")
+    public SseEmitter subscribe() {
+        return sseEmitterService.createEmitter();
+    }
+
+}
diff --git a/backend/src/main/java/com/example/backend/dashboard/dto/CaseDetectRequest.java b/backend/src/main/java/com/example/backend/dashboard/dto/CaseDetectRequest.java
@@ -0,0 +1,12 @@
+package com.example.backend.dashboard.dto;
+import lombok.Data;
+
+@Data
+public class CaseDetectRequest {
+    private Integer officeId; // 사무소 ID
+    private Integer cctvId;   // CCTV ID
+    private Integer level;    // 위험 레벨
+    private String category;  // "fire", "assault" 등
+    private String video;  // 스토리지에 저장된 영상 URL
+    private String memo;      // 기타 메모
+}
diff --git a/backend/src/main/java/com/example/backend/dashboard/dto/CaseDetectResponse.java b/backend/src/main/java/com/example/backend/dashboard/dto/CaseDetectResponse.java
@@ -0,0 +1,32 @@
+package com.example.backend.dashboard.dto;
+
+import com.example.backend.common.domain.CaseEntity;
+import java.time.format.DateTimeFormatter;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CaseDetectResponse {
+    private Integer caseId;       // 사건 ID
+    private String category;      // 사건 카테고리 (예: fire, assault 등)
+    private String cctvAddress;   // CCTV 주소
+    private String dateTime;      // 사건 감지 시각 (문자열 형태, yyyy-MM-dd HH:mm:ss)
+    private String video;      // 영상 URL
+
+    public static CaseDetectResponse fromEntity(CaseEntity entity) {
+        String formattedDateTime = entity.getDate()
+                .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        return CaseDetectResponse.builder()
+                .caseId(entity.getId())
+                .category(entity.getCategory().name())
+                .cctvAddress(entity.getCctv().getAddress())
+                .dateTime(formattedDateTime)
+                .video(entity.getVideo())
+                .build();
+    }
+}
diff --git a/backend/src/main/java/com/example/backend/dashboard/service/CaseDetectService.java b/backend/src/main/java/com/example/backend/dashboard/service/CaseDetectService.java
@@ -0,0 +1,48 @@
+package com.example.backend.dashboard.service;
+
+import com.example.backend.common.domain.CaseEntity;
+import com.example.backend.common.domain.CctvEntity;
+import com.example.backend.common.domain.OfficeEntity;
+import com.example.backend.dashboard.dto.CaseDetectRequest;
+import com.example.backend.dashboard.dto.CaseDetectResponse;
+import com.example.backend.dashboard.repository.ProgressRepository;
+import com.example.backend.search.repository.CctvRepository;
+import jakarta.persistence.EntityNotFoundException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class CaseDetectService {
+
+    private final ProgressRepository caseRepository;
+    private final CctvRepository cctvRepository; // CCTV 정보(주소) 조회용
+
+    public CaseDetectResponse saveCase(CaseDetectRequest request) {
+        // 1) CCTV 정보 조회 (주소 포함)
+        CctvEntity cctvEntity = cctvRepository.findById(request.getCctvId())
+                .orElseThrow(() -> new EntityNotFoundException("CCTV 정보를 찾을 수 없습니다."));
+
+        // 2) 사건 저장
+        CaseEntity caseEntity = CaseEntity.builder()
+                .office(OfficeEntity.builder().id(request.getOfficeId()).build())
+                .cctv(cctvEntity)
+                .date(LocalDateTime.now())
+                .category(CaseEntity.CaseCategory.valueOf(request.getCategory()))
+                .video(request.getVideo())
+                .state(CaseEntity.CaseState.미확인)
+                .accuracy(true)
+                .memo(request.getMemo())
+                .level(request.getLevel())
+                .build();
+
+        CaseEntity saved = caseRepository.save(caseEntity);
+
+        // 3) DTO 변환: 기존에 정의한 fromEntity 메서드를 사용하여 응답 객체 생성
+        return CaseDetectResponse.fromEntity(saved);
+    }
+}
diff --git a/backend/src/main/java/com/example/backend/dashboard/service/SseEmitterService.java b/backend/src/main/java/com/example/backend/dashboard/service/SseEmitterService.java
@@ -0,0 +1,40 @@
+package com.example.backend.dashboard.service;
+import com.example.backend.dashboard.dto.CaseDetectResponse;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Service;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+@Service
+public class SseEmitterService {
+
+    private final List<SseEmitter> emitters = new CopyOnWriteArrayList<>();
+
+    public SseEmitter createEmitter() {
+        SseEmitter emitter = new SseEmitter(Long.MAX_VALUE);
+        emitters.add(emitter);
+
+        emitter.onCompletion(() -> emitters.remove(emitter));
+        emitter.onTimeout(() -> emitters.remove(emitter));
+        return emitter;
+    }
+
+    public void broadcast(CaseDetectResponse response) {
+        List<SseEmitter> deadEmitters = new ArrayList<>();
+        for (SseEmitter emitter : emitters) {
+            try {
+                emitter.send(SseEmitter.event()
+                        .name("alarm-detected")
+                        .data(response, MediaType.APPLICATION_JSON));
+            } catch (IOException e) {
+                deadEmitters.add(emitter);
+            }
+        }
+        emitters.removeAll(deadEmitters);
+    }
+
+}
diff --git a/backend/src/main/java/com/example/backend/search/controller/SearchController.java b/backend/src/main/java/com/example/backend/search/controller/SearchController.java
@@ -31,7 +31,7 @@ public ResponseEntity<?> getCheckLog(@RequestBody SearchRequest request, HttpSes
                 request.getCategory(),
                 request.getStartDateTime(),
                 request.getEndDateTime(),
-                request.getLocation(),
+                request.getAddress(),
                 request.getPolice(),
                 request.getOrder(),
                 request.getPage(),
diff --git a/backend/src/main/java/com/example/backend/search/dto/DetailResponse.java b/backend/src/main/java/com/example/backend/search/dto/DetailResponse.java
@@ -13,7 +13,7 @@ public class DetailResponse {
     private int policeId;
     private String policeName;
     private int cctvId;
-    private String location;
+    private String address;
     private Double longitude;
     private Double latitude;
 
@@ -25,13 +25,13 @@ public class DetailResponse {
     private String memo;
 
     @Builder
-    public DetailResponse(Integer id, Integer policeId, String policeName, Integer cctvId, String location, Double latitude, Double longitude,LocalDateTime date,
+    public DetailResponse(Integer id, Integer policeId, String policeName, Integer cctvId, String address, Double latitude, Double longitude, LocalDateTime date,
                           String category, String video, String memo) {
         this.id = id;
         this.policeId = policeId;
         this.policeName = policeName;
         this.cctvId = cctvId;
-        this.location = location;
+        this.address = address;
         this.latitude = latitude;
         this.longitude = longitude;
         this.date = date;
@@ -46,7 +46,7 @@ public static DetailResponse fromEntity(CaseEntity entity) {
                 .policeId(entity.getPolice() != null ? entity.getPolice().getId() : null)
                 .policeName(entity.getPolice() != null ? entity.getPolice().getName() : null)
                 .cctvId(entity.getCctv() != null ? entity.getCctv().getId() : null)
-                .location(entity.getCctv().getAddress())
+                .address(entity.getCctv().getAddress())
                 .latitude(entity.getCctv().getLatitude())
                 .longitude(entity.getCctv().getLongitude())
                 .date(entity.getDate())
diff --git a/backend/src/main/java/com/example/backend/search/dto/SearchRequest.java b/backend/src/main/java/com/example/backend/search/dto/SearchRequest.java
@@ -10,7 +10,7 @@ public class SearchRequest {
     private String category;
     private String startDate;
     private String endDate;
-    private String location;
+    private String address;
     private String police;
     private String order;
     private Integer page;
diff --git a/backend/src/main/java/com/example/backend/search/dto/SearchResponse.java b/backend/src/main/java/com/example/backend/search/dto/SearchResponse.java
@@ -17,7 +17,7 @@ public class SearchResponse {
     private int policeId;
     private String policeName;
     private int cctvId;
-    private String location;
+    private String address;
 
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime date;
@@ -26,13 +26,13 @@ public class SearchResponse {
     private String memo;
 
     @Builder
-    public SearchResponse(Integer id, Integer policeId, String policeName, Integer cctvId, String location, LocalDateTime date,
+    public SearchResponse(Integer id, Integer policeId, String policeName, Integer cctvId, String address, LocalDateTime date,
                           String category, String memo) {
         this.id = id;
         this.policeId = policeId;
         this.policeName = policeName;
         this.cctvId = cctvId;
-        this.location = location;
+        this.address = address;
         this.date = date;
         this.category = category;
         this.memo = memo;
@@ -44,7 +44,7 @@ public static SearchResponse fromEntity(CaseEntity entity) {
                 .policeId(entity.getPolice() != null ? entity.getPolice().getId() : null)
                 .policeName(entity.getPolice() != null ? entity.getPolice().getName() : null)
                 .cctvId(entity.getCctv() != null ? entity.getCctv().getId() : null)
-                .location(entity.getCctv().getAddress())
+                .address(entity.getCctv().getAddress())
                 .date(entity.getDate())
                 .category(entity.getCategory().name())
                 .memo(entity.getMemo())
diff --git a/backend/src/main/java/com/example/backend/search/repository/CctvRepository.java b/backend/src/main/java/com/example/backend/search/repository/CctvRepository.java
@@ -11,6 +11,6 @@
 @Repository
 public interface CctvRepository extends JpaRepository<CctvEntity, Integer> {
 
-    @Query("SELECT c.id FROM CctvEntity c WHERE c.address LIKE %:location%")
-    List<Integer> findCctvIdsByAddress(@Param("location") String location);
+    @Query("SELECT c.id FROM CctvEntity c WHERE c.address LIKE %:address%")
+    List<Integer> findCctvIdsByAddress(@Param("location") String address);
 }
diff --git a/backend/src/main/java/com/example/backend/search/service/SearchService.java b/backend/src/main/java/com/example/backend/search/service/SearchService.java
@@ -23,11 +23,11 @@ public class SearchService {
     private final CctvRepository cctvRepository;
     private static final int PAGE_SIZE = 8; // 한 페이지당 8개씩
 
-    public SearchResult getCheckLog(String category, LocalDateTime startDate, LocalDateTime endDate, String location, String police, String order, Integer page, Integer officeId) {
-        // location이 있을 경우, cctv_info에서 해당 주소를 가진 cctv_id 리스트 조회
+    public SearchResult getCheckLog(String category, LocalDateTime startDate, LocalDateTime endDate, String address, String police, String order, Integer page, Integer officeId) {
+        // address가 있을 경우, cctv_info에서 해당 주소를 가진 cctv_id 리스트 조회
         List<Integer> cctvIds = null;
-        if (location != null) {
-            cctvIds = cctvRepository.findCctvIdsByAddress(location);
+        if (address != null) {
+            cctvIds = cctvRepository.findCctvIdsByAddress(address);
         }
 
         // 동적 검색 조건 생성

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@`
`11`	`11`	`@Repository`
`12`	`12`	`public interface CctvRepository extends JpaRepository<CctvEntity, Integer> {`
`13`	`13`
`14`		`- @Query("SELECT c.id FROM CctvEntity c WHERE c.address LIKE %:location%")`
`15`		`- List<Integer> findCctvIdsByAddress(@Param("location") String location);`
	`14`	`+ @Query("SELECT c.id FROM CctvEntity c WHERE c.address LIKE %:address%")`
	`15`	`+ List<Integer> findCctvIdsByAddress(@Param("location") String address);`
`16`	`16`	`}`