|
@@ -1043,9 +1043,20 @@ public class GeoHazardMonitorTokenController {
|
|
|
camera.last("limit 2");
|
|
|
List<BaseCameraManagement> list1 = baseCameraManagementService.list(camera);
|
|
|
if (list1.size() <= 0) {
|
|
|
+ //赋值--股道
|
|
|
+ List<BaseRouteMassage> baseRouteMassageList = baseRouteMassageService.list();
|
|
|
+ if (!ObjectUtils.isEmpty(baseRouteMassageList)) {
|
|
|
+ if (baseRouteMassageList.get(0).getMileagePosition() - heartbeatVo.getCurrentMile() <= 500 && baseRouteMassageList.get(0).getMileagePosition() - heartbeatVo.getCurrentMile() >= 0) {
|
|
|
+ respHeartbeatVo.setRouteTrack(baseRouteMassageList.get(0).getRouteStationTrack().toString());
|
|
|
+ }else {
|
|
|
+ respHeartbeatVo.setRouteTrack("");
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ respHeartbeatVo.setRouteTrack("");
|
|
|
+ }
|
|
|
jsonObject.put("resultCode", 0);
|
|
|
jsonObject.put("message", "前方没有摄像机");
|
|
|
- jsonObject.put("data", "");
|
|
|
+ jsonObject.put("data", respHeartbeatVo);
|
|
|
return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
|
|
|
}
|
|
|
log.info("流程1----------------->");
|
|
@@ -1198,9 +1209,20 @@ public class GeoHazardMonitorTokenController {
|
|
|
base.last("limit 2");
|
|
|
List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
|
|
|
if (list1.size() <= 0) {
|
|
|
+ //赋值--股道
|
|
|
+ List<BaseRouteMassage> baseRouteMassageList = baseRouteMassageService.list();
|
|
|
+ if (!ObjectUtils.isEmpty(baseRouteMassageList)) {
|
|
|
+ if (baseRouteMassageList.get(0).getMileagePosition() - heartbeatVo.getCurrentMile() <= 500 && baseRouteMassageList.get(0).getMileagePosition() - heartbeatVo.getCurrentMile() >= 0) {
|
|
|
+ respHeartbeatVo.setRouteTrack(baseRouteMassageList.get(0).getRouteStationTrack().toString());
|
|
|
+ }else {
|
|
|
+ respHeartbeatVo.setRouteTrack("");
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ respHeartbeatVo.setRouteTrack("");
|
|
|
+ }
|
|
|
jsonObject.put("resultCode", 0);
|
|
|
jsonObject.put("message", "没有监控里程的相机");
|
|
|
- jsonObject.put("data", "");
|
|
|
+ jsonObject.put("data", respHeartbeatVo);
|
|
|
return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
|
|
|
}
|
|
|
log.info("流程2----------------->");
|