Przeglądaj źródła

优化事件列表:各模块所有事件分页(中上-事件列表区域)和查询事件详情两个接口,增加deviceType设备类型查询

james 1 dzień temu
rodzic
commit
6f90f956e2

+ 3 - 3
service-sas/service-sas-biz/src/main/java/com/usky/sas/controller/web/SasHomepageController.java

@@ -81,11 +81,11 @@ public class SasHomepageController {
     @ApiOperation("查询事件详情")
     @GetMapping("/eventDetail")
     public ApiResult<EventDetailResponse> getEventDetail(
-            @ApiParam(value = "事件类型", required = true, example = "snap") 
-            @RequestParam String eventType,
+            @ApiParam(value = "事件类型", required = true, example = "1001")
+            @RequestParam String deviceType,
             @ApiParam(value = "事件ID", required = true, example = "123456") 
             @RequestParam String eventId) {
-        return ApiResult.success(sasHomepageService.getEventDetail(eventType, eventId));
+        return ApiResult.success(sasHomepageService.getEventDetail(deviceType, eventId));
     }
 
     /**

+ 1 - 1
service-sas/service-sas-biz/src/main/java/com/usky/sas/service/SasHomepageService.java

@@ -35,7 +35,7 @@ public interface SasHomepageService {
     /**
      * 事件详情:根据事件类型和事件ID查询事件详细信息
      */
-    EventDetailResponse getEventDetail(String eventType, String eventId);
+    EventDetailResponse getEventDetail(String deviceType, String eventId);
 
     /**
      * 实时视频流

+ 13 - 13
service-sas/service-sas-biz/src/main/java/com/usky/sas/service/impl/SasHomepageServiceImpl.java

@@ -440,31 +440,31 @@ public class SasHomepageServiceImpl implements SasHomepageService {
 //    }
 
     @Override
-    public EventDetailResponse getEventDetail(String eventType, String eventId) {
-        if (StrUtil.isBlank(eventType) || StrUtil.isBlank(eventId)) {
+    public EventDetailResponse getEventDetail(String deviceType, String eventId) {
+        if (StrUtil.isBlank(deviceType) || StrUtil.isBlank(eventId)) {
             return null;
         }
 
-        switch (eventType) {
-            case "snap":
+        switch (deviceType) {
+            case "1001":
                 return getSnapEventDetail(eventId);
-            case "usb":
+            case "1003":
                 return getUsbEventDetail(eventId);
-            case "entrance":
+            case "1005":
                 return getEntranceEventDetail(eventId);
-            case "parking":
+            case "1006":
                 return getParkingEventDetail(eventId);
-            case "alarm":
+            case "1007":
                 return getAlarmEventDetail(eventId);
-            case "patrol":
+            case "1008":
                 return getPatrolEventDetail(eventId);
-            case "perception":
+            case "1009":
                 return getPerceptionEventDetail(eventId);
-            case "acquisition":
+            case "1010":
                 return getAcquisitionEventDetail(eventId);
-            case "collection":
+            case "1011":
                 return getCollectionEventDetail(eventId);
-            case "roadblock":
+            case "1012":
                 return getRoadblockEventDetail(eventId);
             default:
                 return null;

Plik diff jest za duży
+ 0 - 0
service-sas/service-sas-biz/src/main/java/com/usky/sas/service/impl/SasIntelligentServiceImpl.java


+ 2 - 3
service-sas/service-sas-biz/src/main/java/com/usky/sas/service/vo/IntelligentEventPageRequest.java

@@ -15,9 +15,8 @@ public class IntelligentEventPageRequest {
     /**
      * 系统类型(snap、usb、entrance、parking、alarm、patrol、perception、acquisition、collection、roadblock)
      */
-    @ApiModelProperty(value = "事件类型", example = "snap", 
-            allowableValues = "snap,usb,entrance,parking,alarm,patrol,perception,acquisition,collection,roadblock")
-    private String eventType;
+    @ApiModelProperty(value = "设备类型", example = "1001")
+    private String deviceType;
 
     @ApiModelProperty(value = "当前页码", example = "1")
     @Min(value = 1, message = "页码必须大于0")

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików