suntianwu 3 lat temu
rodzic
commit
a65acb2371

+ 1 - 1
pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.5.RELEASE</version>
+        <version>2.3.2.RELEASE</version>
         <relativePath/>
     </parent>
 

+ 3 - 3
src/main/java/com/iden/bms/controller/TraceController.java

@@ -98,12 +98,12 @@ public class TraceController {
             @ApiImplicitParam(paramType = "query", name = "endTime", value = "结束时间(yyyy-MM-dd HH:mm:ss)")
 
     })
-    public Result<CameraVideoVO> getCameraVideoList(HttpServletRequest request, @RequestHeader("token") String token,
+    public Result<List<CameraVideoVO>> getCameraVideoList(HttpServletRequest request, @RequestHeader("token") String token,
                                                  @RequestParam(value = "cameraId", required = false) Long cameraId,
                                                  @RequestParam(value = "beginTime", required = false) String beginTime,
                                                  @RequestParam(value = "endTime", required = false) String endTime){
-        this.traceService.getCameraVideoList(cameraId,beginTime,endTime);
-        return  Result.success("查询成功!");
+        List<CameraVideoVO> datas = this.traceService.getCameraVideoList(cameraId,beginTime,endTime);
+        return  Result.success("查询成功!",datas);
     }
 
     /**

+ 1 - 1
src/main/resources/application.properties

@@ -5,7 +5,7 @@ spring.profiles.active=dev
 server.port=13456
 
 #优雅关闭
-server.shutdown=graceful
+#server.shutdown=graceful
 
 ### spring配置
 # 配置服务名称