gao.qiang 1 год назад
Родитель
Сommit
d9ec63162a

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

@@ -488,54 +488,54 @@ public class BaseCameraManagementController extends BaseController {
     @ApiOperation("根据相机ID获取相机台账管理信息")
     @Log(title = "相机台账管理", businessType = BusinessType.MESSAGE)
     public AjaxResult getInfo(@PathVariable Long id) throws InterruptedException {
-//        BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
-//        LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
-//        if (!ObjectUtils.isEmpty(baseCameraManagement.getRailwayCode())) {
-//            queryWrapper.eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode());
-//        }
-//        BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
-////        SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
-////        baseCameraManagement.setDeptName(sysDept.getDeptName());
-//        baseCameraManagement.setRailwayName(baseRailwayManagement.getRailwayName());
-//        if (!StringUtils.isEmptySunhh(baseCameraManagement.getInstallMile())) {
-//            String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
-//            baseCameraManagement.setInstallMiles(mils);
-//        }
-//        String end = "";
-//        if (!StringUtils.isEmptySunhh(baseCameraManagement.getEndMile())) {
-//            end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
-//            baseCameraManagement.setEndMiles(end);
-//        }
-//        String begin = "";
-//        if (!StringUtils.isEmptySunhh(baseCameraManagement.getBeginMile())) {
-//            begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
-//            baseCameraManagement.setBeginMiles(begin);
-//        }
-//        if (!StringUtils.isEmptySunhh(baseCameraManagement.getInstallMile())) {
-//            baseCameraManagement.setInstallMileBD(new BigDecimal(baseCameraManagement.getInstallMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
-//        }
-//        if (!StringUtils.isEmptySunhh(baseCameraManagement.getBeginMile())) {
-//            baseCameraManagement.setBeginMileBD(new BigDecimal(baseCameraManagement.getBeginMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
-//        }
-//        if (!StringUtils.isEmptySunhh(baseCameraManagement.getEndMile())) {
-//            baseCameraManagement.setEndMileBD(new BigDecimal(baseCameraManagement.getEndMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
-//        }
-//        baseCameraManagement.setLineDirStr(baseCameraManagement.getLineDir() == 1 ? "上行" : "下行");
-//        baseCameraManagement.setMilesRange(begin + "-" + end);
-//        baseCameraManagement.setLongitudeAndLatitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLongitude());
-//        return AjaxResult.success(baseCameraManagement);
-        String cameraPreviewURL = GetCameraPreviewURL.getPreviewURLs();
-        log.info("-------------------------------->>>>>" + cameraPreviewURL);
-        JSONObject outJson = JSONObject.parse(cameraPreviewURL);
-        log.info("-------------------------------->>>>>outJson------" + outJson);
-        JSONObject data = outJson.getJSONObject("data");
-        log.info("-------------------------------->>>>>data------" + data);
-        String urls = data.getString("url");
-        log.info("-------------------------------->>>>>urls------" + urls);
-        TimeUnit.SECONDS.sleep(5);
-        String msg = HttpUtils.sendGet("http://10.48.36.47:9080/rtsp/api/pull?target=" + urls + "&streamPath=01ea43e6676f4e47bd6c5cd9e02aa006/01ea43e6676f4e47bd6c5cd9e02aa006&save=0");
-//        String msg = HttpUtils.sendGet("http://10.48.36.47:9080/api/gateway/stop?stream=01ea43e6676f4e47bd6c5cd9e02aa006/01ea43e6676f4e47bd6c5cd9e02aa006");
-        return AjaxResult.success(msg);
+        BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
+        LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getRailwayCode())) {
+            queryWrapper.eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode());
+        }
+        BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
+//        SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
+//        baseCameraManagement.setDeptName(sysDept.getDeptName());
+        baseCameraManagement.setRailwayName(baseRailwayManagement.getRailwayName());
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getInstallMile())) {
+            String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
+            baseCameraManagement.setInstallMiles(mils);
+        }
+        String end = "";
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getEndMile())) {
+            end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
+            baseCameraManagement.setEndMiles(end);
+        }
+        String begin = "";
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getBeginMile())) {
+            begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
+            baseCameraManagement.setBeginMiles(begin);
+        }
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getInstallMile())) {
+            baseCameraManagement.setInstallMileBD(new BigDecimal(baseCameraManagement.getInstallMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
+        }
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getBeginMile())) {
+            baseCameraManagement.setBeginMileBD(new BigDecimal(baseCameraManagement.getBeginMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
+        }
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getEndMile())) {
+            baseCameraManagement.setEndMileBD(new BigDecimal(baseCameraManagement.getEndMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
+        }
+        baseCameraManagement.setLineDirStr(baseCameraManagement.getLineDir() == 1 ? "上行" : "下行");
+        baseCameraManagement.setMilesRange(begin + "-" + end);
+        baseCameraManagement.setLongitudeAndLatitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLongitude());
+        return AjaxResult.success(baseCameraManagement);
+//        String cameraPreviewURL = GetCameraPreviewURL.getPreviewURLs();
+//        log.info("-------------------------------->>>>>" + cameraPreviewURL);
+//        JSONObject outJson = JSONObject.parse(cameraPreviewURL);
+//        log.info("-------------------------------->>>>>outJson------" + outJson);
+//        JSONObject data = outJson.getJSONObject("data");
+//        log.info("-------------------------------->>>>>data------" + data);
+//        String urls = data.getString("url");
+//        log.info("-------------------------------->>>>>urls------" + urls);
+//        TimeUnit.SECONDS.sleep(5);
+//        String msg = HttpUtils.sendGet("http://10.48.36.47:9080/rtsp/api/pull?target=" + urls + "&streamPath=01ea43e6676f4e47bd6c5cd9e02aa006/01ea43e6676f4e47bd6c5cd9e02aa006&save=0");
+////        String msg = HttpUtils.sendGet("http://10.48.36.47:9080/api/gateway/stop?stream=01ea43e6676f4e47bd6c5cd9e02aa006/01ea43e6676f4e47bd6c5cd9e02aa006");
+//        return AjaxResult.success(msg);
     }
 
     /**