|
@@ -791,9 +791,20 @@ public class GeoHazardMonitorTokenController {
|
|
|
// }
|
|
|
// respHeartbeatVo.setAlarmInfo(alarmInfoVo);
|
|
|
} else {
|
|
|
+ //赋值--股道
|
|
|
+ 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);
|
|
|
}
|
|
|
for (int i = 0; i < list.size(); i++) {
|