Merge remote-tracking branch 'origin/master'

zuoxiao

2025-06-25 d2fc819dc069c7b8d338ae52a90a7f38704fac08

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/video/VideoCtrl.java

@@ -19,6 +19,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -70,7 +71,7 @@
                            schema = @Schema(implementation = VoCamera.class))}
            )
    })
    @PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
    @GetMapping(path = "some")
    @SsoAop()
    public BaseResponse<QueryResultVo<List<VoVideo>>> some(VideoQo queryQo){
        try {
@@ -104,6 +105,7 @@
                        vvo.videoUrl4Standard = "" ;
                        vvo.videoUrl4Security = "" ;
                    }
                    list.add(vvo) ;
                }
            }
            QueryResultVo<List<VoVideo>> res = new QueryResultVo<>() ;