显卡使用开发

business-service/src/main/java/com/ozs/entity/BaseCameraManagement.java

@@ -221,5 +221,9 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      */
     @Excel(name = "排序")
     private String sort;
-    
+    /**
+     * 显卡的使用(为了充分使用正式服务器的四张显卡)
+     */
+    @TableField(exist = false)
+    private String graphicsCard;
 }

business-service/src/main/java/com/ozs/service/impl/BaseCameraManagementServiceImpl.java

@@ -484,7 +484,7 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
         if (!ObjectUtils.isEmpty(baseCameraManagementList)) {
             List<BaseCameraManagement> list = new ArrayList<>(baseCameraManagementList);
             for (BaseCameraManagement baseCameraManagement : list) {
-                String flv = CameraUtil.getPlayFlv(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
+                String flv = CameraUtil.getPlayFlv(baseCameraManagement.getCameraCode(), baseCameraManagement.getGraphicsCard());
                 BaseVehicleTerminalDto dto = new BaseVehicleTerminalDto();
                 dto.setUrl(flv);
                 dto.setCameraCode(baseCameraManagement.getCameraCode());

business-service/src/main/java/com/ozs/utils/CameraUtil.java

@@ -1520,7 +1520,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         ArrayList<String> codeList = new ArrayList<>();
         if (!ObjectUtils.isEmpty(list)) {
             for (BaseCameraManagement baseCameraManagement : list) {
-                codeList.add(baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel());
+                codeList.add(baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getGraphicsCard());
             }
         }
 

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -698,7 +698,7 @@ public class BaseCameraManagementController extends BaseController {
         if (ObjectUtils.isEmpty(one)) {
             throw new BaseException("相机编号【" + cameraCode + "】不存在");
         }
-        return new AjaxResult(200, "ok", CameraUtil.invite(cameraCode, one.getChannel()));
+        return new AjaxResult(200, "ok", CameraUtil.invite(cameraCode, one.getGraphicsCard()));
     }
 
 
@@ -712,7 +712,7 @@ public class BaseCameraManagementController extends BaseController {
         if (ObjectUtils.isEmpty(one)) {
             throw new BaseException("相机编号【" + cameraCode + "】不存在");
         }
-        return new AjaxResult(200, "ok", CameraUtil.getPlayFlv(cameraCode, one.getChannel(), flay));
+        return new AjaxResult(200, "ok", CameraUtil.getPlayFlv(cameraCode, one.getGraphicsCard(), flay));
     }
 
     @GetMapping("/api/getRecordByAlarmId")
@@ -778,9 +778,9 @@ public class BaseCameraManagementController extends BaseController {
             }
             String playFlv = null;
             if (list.size() > 5) {
-                playFlv = CameraUtil.getPlayFlv(cameraCode, one.getChannel(), false);
+                playFlv = CameraUtil.getPlayFlv(cameraCode, one.getGraphicsCard(), false);
             } else {
-                playFlv = CameraUtil.getPlayFlv(cameraCode, one.getChannel());
+                playFlv = CameraUtil.getPlayFlv(cameraCode, one.getGraphicsCard());
             }
             list.add(playFlv);
         }
@@ -918,10 +918,10 @@ public class BaseCameraManagementController extends BaseController {
     public AjaxResult startRecording(@PathVariable Long id) {
         BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
         log.info("startRecording------CameraCode------" + baseCameraManagement.getCameraCode());
-        log.info("startRecording------Channel------" + baseCameraManagement.getChannel());
-        String start = HttpUtils.sendGet(CameraUtil.startRecording(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel()));
+        log.info("startRecording------Channel------" + baseCameraManagement.getGraphicsCard());
+        String start = HttpUtils.sendGet(CameraUtil.startRecording(baseCameraManagement.getCameraCode(), baseCameraManagement.getGraphicsCard()));
         log.info("startRecording------------" + start);
-        if (start.startsWith(baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel())) {
+        if (start.startsWith(baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getGraphicsCard())) {
             log.info("startRecording 返回成功！！1");
             baseCameraManagement.setStartRecording(1);
             baseCameraManagement.setTaskId(start);

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseVehicleController.java

@@ -325,7 +325,7 @@ public class BaseVehicleController extends BaseController {
         if (!ObjectUtils.isEmpty(baseCameraManagementList)) {
             List<String> list=new ArrayList<>();
             for (BaseCameraManagement baseCameraManagement : baseCameraManagementList) {
-                String flv = CameraUtil.getPlayFlv(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
+                String flv = CameraUtil.getPlayFlv(baseCameraManagement.getCameraCode(), baseCameraManagement.getGraphicsCard());
                 list.add(flv);
             }
             return AjaxResult.success(list);

vehicle-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -668,7 +668,7 @@ public class GeoHazardMonitorTokenController {
                         if (baseCameraManagementList.size() > 0) {
                             int minDifference = Integer.MAX_VALUE;
                             String code = null;
-                            String channel = null;
+                            String graphicsCard = null;
                             for (BaseCameraManagement baseCameraManagement : baseCameraManagementList) {
                                 log.info("------------baseCameraManagement.getInstallMile()-------" + baseCameraManagement.getInstallMile());
                                 log.info("------------list.get(0).getAlarmMile()-------" + list.get(0).getAlarmMile());
@@ -680,13 +680,13 @@ public class GeoHazardMonitorTokenController {
                                     log.info("------------minDifference变更-------" + minDifference);
                                     code = baseCameraManagement.getCameraCode();
                                     log.info("------------code-------" + code);
-                                    channel = baseCameraManagement.getChannel();
-                                    log.info("------------channel-------" + channel);
+                                    graphicsCard = baseCameraManagement.getGraphicsCard();
+                                    log.info("------------graphicsCard-------" + graphicsCard);
                                 }
                             }
-                            playFlv1 = cameraUtil.heartbeatgetPlayFlv(code, channel, type);
+                            playFlv1 = cameraUtil.heartbeatgetPlayFlv(code, graphicsCard, type);
                             if (StringUtils.isEmpty(playFlv1)) {
-                                playFlv1 = cameraUtil.heartbeatgetUrl(code, channel, type);
+                                playFlv1 = cameraUtil.heartbeatgetUrl(code, graphicsCard, type);
                                 if (playFlv1.contains("无视频")) {
                                     AjaxResults1 = new AjaxResults(0, playFlv1);
                                     return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
@@ -734,7 +734,7 @@ public class GeoHazardMonitorTokenController {
                                 if (i > 0) {
                                     int minDifference = Integer.MAX_VALUE;
                                     String code = null;
-                                    String channel = null;
+                                    String graphicsCard = null;
                                     for (BaseCameraManagement baseCameraManagement : baseList) {
                                         log.info("------------baseCameraManagement.getInstallMile()-------" + baseCameraManagement.getInstallMile());
                                         log.info("------------list.get(0).getAlarmMile()-------" + list.get(0).getAlarmMile());
@@ -746,11 +746,11 @@ public class GeoHazardMonitorTokenController {
                                             log.info("------------minDifference变更-------" + minDifference);
                                             code = baseCameraManagement.getCameraCode();
                                             log.info("------------code-------" + code);
-                                            channel = baseCameraManagement.getChannel();
-                                            log.info("------------channel-------" + channel);
+                                            graphicsCard = baseCameraManagement.getGraphicsCard();
+                                            log.info("------------graphicsCard-------" + graphicsCard);
                                         }
                                     }
-                                    playFlv1 = cameraUtil.heartbeatgetPlayFlv(code, channel, type);
+                                    playFlv1 = cameraUtil.heartbeatgetPlayFlv(code, graphicsCard, type);
                                 }
                                 AlarmListVo alarmListVo = new AlarmListVo();
                                 //alarmList对象
@@ -809,9 +809,9 @@ public class GeoHazardMonitorTokenController {
                         List<BaseCameraManagement> baseCameraManagementList1 = cameraUtil.getBaseCameraManagementList(baseCameraManagement.getId(), heartbeatVo.getLineDir());
                         if (!ObjectUtils.isEmpty(baseCameraManagementList1)) {
                             for (BaseCameraManagement cameraManagement : baseCameraManagementList1) {
-                                String playFlv = cameraUtil.heartbeatgetPlayFlv(cameraManagement.getCameraCode(), cameraManagement.getChannel(), type);
+                                String playFlv = cameraUtil.heartbeatgetPlayFlv(cameraManagement.getCameraCode(), cameraManagement.getGraphicsCard(), type);
                                 if (StringUtils.isEmpty(playFlv)) {
-                                    String url = cameraUtil.heartbeatgetUrl(cameraManagement.getCameraCode(), cameraManagement.getChannel(), type);
+                                    String url = cameraUtil.heartbeatgetUrl(cameraManagement.getCameraCode(), cameraManagement.getGraphicsCard(), type);
                                     if (url.contains("无视频")) {
                                         AjaxResults1 = new AjaxResults(0, url);
                                         return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
@@ -852,7 +852,7 @@ public class GeoHazardMonitorTokenController {
                             if (baseCameraManagementList.size() > 0) {
                                 int minDifference = Integer.MAX_VALUE;
                                 String code = null;
-                                String channel = null;
+                                String graphicsCard = null;
                                 for (BaseCameraManagement baseCameraManagement : baseCameraManagementList) {
                                     log.info("------------baseCameraManagement.getInstallMile()-------" + baseCameraManagement.getInstallMile());
                                     log.info("------------list.get(0).getAlarmMile()-------" + mile);
@@ -864,20 +864,20 @@ public class GeoHazardMonitorTokenController {
                                         log.info("------------minDifference变更-------" + minDifference);
                                         code = baseCameraManagement.getCameraCode();
                                         log.info("------------code-------" + code);
-                                        channel = baseCameraManagement.getChannel();
-                                        log.info("------------channel-------" + channel);
+                                        graphicsCard = baseCameraManagement.getGraphicsCard();
+                                        log.info("------------graphicsCard-------" + graphicsCard);
                                     }
                                     //添加预警信息
                                     PreAlarmListResponse preAlarmListResponse = new PreAlarmListResponse();
                                     BeanUtils.copyProperties(preAlarmList.get(i), preAlarmListResponse);
                                     preAlarmListResponse.setCameraCode(baseCameraManagement.getCameraCode());
-                                    preAlarmListResponse.setCameraStream(cameraUtil.heartbeatgetPlayFlv(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel(), type));
+                                    preAlarmListResponse.setCameraStream(cameraUtil.heartbeatgetPlayFlv(baseCameraManagement.getCameraCode(), baseCameraManagement.getGraphicsCard(), type));
                                     responseList.add(preAlarmListResponse);
                                 }
                                 if (i == 0) {
-                                    playFlv1 =cameraUtil.heartbeatgetPlayFlv(code, channel, type);
+                                    playFlv1 =cameraUtil.heartbeatgetPlayFlv(code, graphicsCard, type);
                                     if (StringUtils.isEmpty(playFlv1)) {
-                                        playFlv1 = cameraUtil.heartbeatgetUrl(code, channel, type);
+                                        playFlv1 = cameraUtil.heartbeatgetUrl(code, graphicsCard, type);
                                         if (playFlv1.contains("无视频")) {
                                             AjaxResults1 = new AjaxResults(0, playFlv1);
                                             return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
@@ -928,7 +928,7 @@ public class GeoHazardMonitorTokenController {
                         }
                         log.info("流程1----------------->");
                         //判断流媒体是否有流
-                        String playFlv = cameraUtil.heartbeatgetPlayFlv(list1.get(0).getCameraCode(), list1.get(0).getChannel(), type);
+                        String playFlv = cameraUtil.heartbeatgetPlayFlv(list1.get(0).getCameraCode(), list1.get(0).getGraphicsCard(), type);
                         log.info("playFlv------------>" + playFlv);
                         baseVideoTrains.setVideoMile(list1.get(0).getInstallMile());
                         long delay = System.currentTimeMillis();
@@ -953,9 +953,9 @@ public class GeoHazardMonitorTokenController {
                                 List<BaseCameraManagement> baseCameraManagementList1 = cameraUtil.getBaseCameraManagementList(baseCameraManagement.getId(), heartbeatVo.getLineDir());
                                 if (!ObjectUtils.isEmpty(baseCameraManagementList1)) {
                                     for (BaseCameraManagement cameraManagement : baseCameraManagementList1) {
-                                        String flv = cameraUtil.heartbeatgetPlayFlv(cameraManagement.getCameraCode(), cameraManagement.getChannel(), type);
+                                        String flv = cameraUtil.heartbeatgetPlayFlv(cameraManagement.getCameraCode(), cameraManagement.getGraphicsCard(), type);
                                         if (StringUtils.isEmpty(flv)) {
-                                            String url = cameraUtil.heartbeatgetUrl(cameraManagement.getCameraCode(), cameraManagement.getChannel(), type);
+                                            String url = cameraUtil.heartbeatgetUrl(cameraManagement.getCameraCode(), cameraManagement.getGraphicsCard(), type);
                                             if (url.contains("无视频")) {
                                                 AjaxResults1 = new AjaxResults(0, url);
                                                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
@@ -981,9 +981,9 @@ public class GeoHazardMonitorTokenController {
                                 List<BaseCameraManagement> baseCameraManagementList1 = cameraUtil.getBaseCameraManagementList(list1.get(finalI).getId(), heartbeatVo.getLineDir());
                                 if (!ObjectUtils.isEmpty(baseCameraManagementList1)) {
                                     for (BaseCameraManagement cameraManagement : baseCameraManagementList1) {
-                                        String flv = cameraUtil.heartbeatgetPlayFlv(cameraManagement.getCameraCode(), cameraManagement.getChannel(), finalType);
+                                        String flv = cameraUtil.heartbeatgetPlayFlv(cameraManagement.getCameraCode(), cameraManagement.getGraphicsCard(), finalType);
                                         if (StringUtils.isEmpty(flv)) {
-                                            String url = cameraUtil.heartbeatgetUrl(cameraManagement.getCameraCode(), cameraManagement.getChannel(), finalType);
+                                            String url = cameraUtil.heartbeatgetUrl(cameraManagement.getCameraCode(), cameraManagement.getGraphicsCard(), finalType);
                                             if (url.contains("无视频")) {
                                                 AjaxResults1 = new AjaxResults(0, url);
                                                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
@@ -1000,7 +1000,7 @@ public class GeoHazardMonitorTokenController {
                                 CameraVos cameraVos = new CameraVos();
                                 cameraVos.setCameraCode(baseCameraManagement.getCameraCode());
                                 String cacheObject = redisCache.getCacheObject(baseCameraManagement.getCameraCode());
-                                cameraVos.setCurrentStream(CameraUtil.getPlayFlvRtsp(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel(), type, cacheObject));
+                                cameraVos.setCurrentStream(CameraUtil.getPlayFlvRtsp(baseCameraManagement.getCameraCode(), baseCameraManagement.getGraphicsCard(), type, cacheObject));
                                 cameraVosList.add(cameraVos);
                             }
                             respHeartbeatVo.setCameraList(cameraVosList);
@@ -1042,7 +1042,7 @@ public class GeoHazardMonitorTokenController {
                         if (baseCameraManagementList.size() > 0) {
                             int minDifference = Integer.MAX_VALUE;
                             String code = null;
-                            String channel = null;
+                            String graphicsCard = null;
                             for (BaseCameraManagement baseCameraManagement : baseCameraManagementList) {
                                 log.info("------------baseCameraManagement.getInstallMile()-------" + baseCameraManagement.getInstallMile());
                                 log.info("------------list.get(0).getAlarmMile()-------" + mile);
@@ -1054,20 +1054,20 @@ public class GeoHazardMonitorTokenController {
                                     log.info("------------minDifference变更-------" + minDifference);
                                     code = baseCameraManagement.getCameraCode();
                                     log.info("------------code-------" + code);
-                                    channel = baseCameraManagement.getChannel();
-                                    log.info("------------channel-------" + channel);
+                                    graphicsCard = baseCameraManagement.getGraphicsCard();
+                                    log.info("------------graphicsCard-------" + graphicsCard);
                                 }
                                 //添加预警信息
                                 PreAlarmListResponse preAlarmListResponse = new PreAlarmListResponse();
                                 BeanUtils.copyProperties(preAlarmList.get(i), preAlarmListResponse);
                                 preAlarmListResponse.setCameraCode(baseCameraManagement.getCameraCode());
-                                preAlarmListResponse.setCameraStream(cameraUtil.heartbeatgetPlayFlv(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel(), type));
+                                preAlarmListResponse.setCameraStream(cameraUtil.heartbeatgetPlayFlv(baseCameraManagement.getCameraCode(), baseCameraManagement.getGraphicsCard(), type));
                                 responseList.add(preAlarmListResponse);
                             }
                             if (i == 0) {
-                                playFlv1 =cameraUtil.heartbeatgetPlayFlv(code, channel, type);
+                                playFlv1 =cameraUtil.heartbeatgetPlayFlv(code, graphicsCard, type);
                                 if (StringUtils.isEmpty(playFlv1)) {
-                                    playFlv1 = cameraUtil.heartbeatgetUrl(code, channel, type);
+                                    playFlv1 = cameraUtil.heartbeatgetUrl(code, graphicsCard, type);
                                     if (playFlv1.contains("无视频")) {
                                         AjaxResults1 = new AjaxResults(0, playFlv1);
                                         return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
@@ -1118,7 +1118,7 @@ public class GeoHazardMonitorTokenController {
                     }
                     log.info("流程2----------------->");
                     //判断流媒体是否有流
-                    String playFlv = cameraUtil.heartbeatgetPlayFlv(list1.get(0).getCameraCode(), list1.get(0).getChannel(), type);
+                    String playFlv = cameraUtil.heartbeatgetPlayFlv(list1.get(0).getCameraCode(), list1.get(0).getGraphicsCard(), type);
                     log.info("playFlv------------>" + playFlv);
                     baseVideoTrains.setVideoMile(list1.get(0).getInstallMile());
                     long delay = System.currentTimeMillis();
@@ -1144,9 +1144,9 @@ public class GeoHazardMonitorTokenController {
                             List<BaseCameraManagement> baseCameraManagementList1 = cameraUtil.getBaseCameraManagementList(baseCameraManagement.getId(), heartbeatVo.getLineDir());
                             if (!ObjectUtils.isEmpty(baseCameraManagementList1)) {
                                 for (BaseCameraManagement cameraManagement : baseCameraManagementList1) {
-                                    String flv = cameraUtil.heartbeatgetPlayFlv(cameraManagement.getCameraCode(), cameraManagement.getChannel(), finalType);
+                                    String flv = cameraUtil.heartbeatgetPlayFlv(cameraManagement.getCameraCode(), cameraManagement.getGraphicsCard(), finalType);
                                     if (StringUtils.isEmpty(flv)) {
-                                        String url = cameraUtil.heartbeatgetUrl(cameraManagement.getCameraCode(), cameraManagement.getChannel(), finalType);
+                                        String url = cameraUtil.heartbeatgetUrl(cameraManagement.getCameraCode(), cameraManagement.getGraphicsCard(), finalType);
                                         if (url.contains("无视频")) {
                                             AjaxResults1 = new AjaxResults(0, url);
                                             return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
@@ -1167,9 +1167,9 @@ public class GeoHazardMonitorTokenController {
                             List<BaseCameraManagement> baseCameraManagementList1 = cameraUtil.getBaseCameraManagementList(list1.get(i).getId(), heartbeatVo.getLineDir());
                             if (!ObjectUtils.isEmpty(baseCameraManagementList1)) {
                                 for (BaseCameraManagement cameraManagement : baseCameraManagementList1) {
-                                    String flv = cameraUtil.heartbeatgetPlayFlv(cameraManagement.getCameraCode(), cameraManagement.getChannel(), type);
+                                    String flv = cameraUtil.heartbeatgetPlayFlv(cameraManagement.getCameraCode(), cameraManagement.getGraphicsCard(), type);
                                     if (StringUtils.isEmpty(flv)) {
-                                        String url = cameraUtil.heartbeatgetUrl(cameraManagement.getCameraCode(), cameraManagement.getChannel(), type);
+                                        String url = cameraUtil.heartbeatgetUrl(cameraManagement.getCameraCode(), cameraManagement.getGraphicsCard(), type);
                                         if (url.contains("无视频")) {
                                             AjaxResults1 = new AjaxResults(0, url);
                                             return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
@@ -1186,7 +1186,7 @@ public class GeoHazardMonitorTokenController {
                             CameraVos cameraVos = new CameraVos();
                             cameraVos.setCameraCode(baseCameraManagement.getCameraCode());
                             String cacheObject = redisCache.getCacheObject(baseCameraManagement.getCameraCode());
-                            cameraVos.setCurrentStream(CameraUtil.getPlayFlvRtsp(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel(), type, cacheObject));
+                            cameraVos.setCurrentStream(CameraUtil.getPlayFlvRtsp(baseCameraManagement.getCameraCode(), baseCameraManagement.getGraphicsCard(), type, cacheObject));
                             cameraVosList.add(cameraVos);
                         }
                         respHeartbeatVo.setCameraList(cameraVosList);
@@ -1437,13 +1437,13 @@ public class GeoHazardMonitorTokenController {
                 AjaxResults1 = new AjaxResults(0, "没有该相机编码的相机或已离线");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
             }
-            String playFlv = cameraUtil.heartbeatgetUrls(one.getCameraCode(), one.getChannel(), false);
+            String playFlv = cameraUtil.heartbeatgetUrls(one.getCameraCode(), one.getGraphicsCard(), false);
             if (playFlv.contains("无视频")) {
                 AjaxResults1 = new AjaxResults(0, playFlv);
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
             }
             ArrayList<String> list3 = new ArrayList<>();
-            String code = one.getCameraCode() + "/" + one.getChannel();
+            String code = one.getCameraCode() + "/" + one.getGraphicsCard();
             list3.add(code);
             log.info("--------------cameraPlay--------------:" + list3);
             map.put("url", playFlv);