|
@@ -12,6 +12,7 @@ import com.ozs.common.utils.ChineseToPingyin;
|
|
|
import com.ozs.common.utils.StringUtils;
|
|
|
import com.ozs.common.utils.file.FileUtils;
|
|
|
import com.ozs.common.utils.poi.ExcelUtil;
|
|
|
+import com.ozs.entity.BaseCameraManagement;
|
|
|
import com.ozs.entity.BaseRailwayManagement;
|
|
|
import com.ozs.entity.BaseTerminal;
|
|
|
import com.ozs.entity.BaseVehicle;
|
|
@@ -20,6 +21,7 @@ import com.ozs.entity.vo.BaseRailwayManagementVo;
|
|
|
import com.ozs.entity.vo.BaseVehicleTerminalVo;
|
|
|
import com.ozs.entity.vo.BaseVehicleVo;
|
|
|
import com.ozs.entity.vo.VehicleTreeVo;
|
|
|
+import com.ozs.service.BaseCameraManagementService;
|
|
|
import com.ozs.service.BaseDeviceDynamicManagementService;
|
|
|
import com.ozs.service.BaseRailwayManagementService;
|
|
|
import com.ozs.service.BaseVehicleService;
|
|
@@ -54,6 +56,8 @@ import java.util.stream.Collectors;
|
|
|
public class BaseVehicleController extends BaseController {
|
|
|
@Resource
|
|
|
BaseRailwayManagementService baseRailwayManagementService;
|
|
|
+ @Resource
|
|
|
+ BaseCameraManagementService cameraManagementService;
|
|
|
@Autowired
|
|
|
private DataScoreUtil dataScoreUtil;
|
|
|
@Autowired
|
|
@@ -345,8 +349,17 @@ public class BaseVehicleController extends BaseController {
|
|
|
Object cameraCode = cacheMap.get("cameraCode");
|
|
|
Object stream = cacheMap.get("currentStream");
|
|
|
if (!ObjectUtils.isEmpty(cameraCode)) {
|
|
|
+ LambdaQueryWrapper<BaseCameraManagement> bcWrapper = new LambdaQueryWrapper<>();
|
|
|
+ bcWrapper.eq(BaseCameraManagement::getCameraCode, cameraCode.toString());
|
|
|
+ BaseCameraManagement one = cameraManagementService.getOne(bcWrapper);
|
|
|
+ //相机编码和实时流
|
|
|
ccMap.put("cameraCode", cameraCode.toString());
|
|
|
ccMap.put("currentStream", stream.toString());
|
|
|
+ //行别
|
|
|
+ String lineDirStr = one.getLineDir() == 1 ? "上行" : "下行";
|
|
|
+ ccMap.put("lineDir", lineDirStr);
|
|
|
+ //安装里程位置
|
|
|
+ ccMap.put("installMile", one.getInstallMiles());
|
|
|
return AjaxResult.success(ccMap);
|
|
|
}
|
|
|
}
|