元谋二期后端软件系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
liurunyu
3 天以前 e1534c601e1310575264a0ddc5266bdd2c47750b 
 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;


@@ -47,8 +48,10 @@


    private String requestVideoCommonUrl;//


    @Value("${video.ys.requestVideoCameraPreUrl: ezopen://open.ys7.com/}")


    private String requestVideoCameraPreUrl;//


    @Value("${video.ys.requestVideoCameraTailUrl: /1.live&themeId=}")


    private String requestVideoCameraTailUrl;//


    @Value("${video.ys.requestVideoCameraTail4LiveUrl: /1.live}")


    private String requestVideoCameraTail4LiveUrl;//


    @Value("${video.ys.requestVideoCameraTail4ThemeIdUrl: themeId=}")


    private String requestVideoCameraTail4ThemeIdUrl;//




    @Autowired


    private void setSv(VideoSv sv, YsAppSv ysSv){


@@ -70,9 +73,9 @@


                            schema = @Schema(implementation = VoCamera.class))}


            )


    })


    @PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)


    @GetMapping(path = "some")


    @SsoAop()


    public BaseResponse<QueryResultVo<List<VoVideo>>> some(CameraQo queryQo){


    public BaseResponse<QueryResultVo<List<VoVideo>>> some(VideoQo queryQo){


        try {


            ViYsApp ysApp = this.ysSv.selectSingleton() ;


            if(ysApp == null){


@@ -95,15 +98,31 @@


                        sb.append("&url=");


                        sb.append(requestVideoCameraPreUrl);


                        sb.append(vo.devNo);


                        sb.append(requestVideoCameraTailUrl);


                        sb.append(requestVideoCameraTail4LiveUrl);


                        sb.append("&");


                        sb.append(requestVideoCameraTail4ThemeIdUrl);


                        vvo.videoUrl4Simple = sb.toString() + "simple";


                        vvo.videoUrl4Standard = sb.toString() + "standard" ;


                        vvo.videoUrl4Security = sb.toString() + "security" ;




                        StringBuilder sb1 = new StringBuilder();


                        sb1.append(requestVideoCommonUrl);


                        sb1.append("&url=");


                        sb1.append(requestVideoCameraPreUrl);


                        sb1.append(vo.devNo);


                        sb1.append(requestVideoCameraTail4LiveUrl);


                        sb1.append("&accessToken=");


                        sb1.append(ysApp.accessToken);


                        sb.append("&");


                        sb1.append(requestVideoCameraTail4ThemeIdUrl);


                        vvo.videoUrl4PcLive = sb1.toString() + "pcLive&env=" ;


                    }else{


                        vvo.videoUrl4Simple = "" ;


                        vvo.videoUrl4Standard = "" ;


                        vvo.videoUrl4Security = "" ;


                        vvo.videoUrl4PcLive = "" ;


                    }


                    list.add(vvo) ;


                }


            }


            QueryResultVo<List<VoVideo>> res = new QueryResultVo<>() ;