轨迹回放时间轴显示船舶

location-rescue-service/src/main/java/com/ai/bss/location/rescue/controller/LocationManagementController.java

@@ -1,18 +1,14 @@
package com.ai.bss.location.rescue.controller;
import java.util.HashMap;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.location.rescue.service.interfaces.LocationManagementService;
import com.ai.bss.location.rescue.util.DateUtil;
import com.ai.bss.location.rescue.util.EbcConstant;
/**
 * 人员定位管理

location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/impl/LocationManagementServiceImpl.java

@@ -234,9 +234,9 @@ public class LocationManagementServiceImpl implements LocationManagementService
			EbcEntityPosition ebcEntityPosition = new EbcEntityPosition();
			ComponentReflectionUtils.copyAttributeFromParent(entityPosition, ebcEntityPosition);
			// 获取人员状态：如果为救援人员，则显示为正常人员
			String maxStatus = getEntityPositionStatus(entityPosition);
			maxStatus = EntityPosition.TAG_TYPE_RESCUE.equals(maxStatus) ? EntityPosition.TAG_TYPE_NORMAL : maxStatus;
			// 获取人员状态：如果为救援人员，则显示为正常人员
			//maxStatus = EntityPosition.TAG_TYPE_RESCUE.equals(maxStatus) ? EntityPosition.TAG_TYPE_NORMAL : maxStatus;
			ebcEntityPosition.setLocationStatus(maxStatus);
			ebcEntityPosition.setCharValueSet(null);

location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/impl/TrackManagementServiceImpl.java

@@ -222,9 +222,10 @@ public class TrackManagementServiceImpl implements TrackManagementService {
		String endTime = requestMap.get("endTime").toString();
		List<Map<String, Object>> list = response.getData().getData();
		List<String> fixToolTypeIds = getFixToolTypeIds();
		//List<String> fixToolTypeIds = getFixToolTypeIds();
		if (CollectionUtils.isEmpty(list) || CollectionUtils.isEmpty(fixToolTypeIds)) {
		//if (CollectionUtils.isEmpty(list) || CollectionUtils.isEmpty(fixToolTypeIds)) {
		if (CollectionUtils.isEmpty(list)) {
			Map<String, Object> wharfAreaMap = getWharfAreaMap(startTime, endTime);
			wharfAreaMap.put("proportion", 100);
			areaList.add(wharfAreaMap);
@@ -233,27 +234,28 @@ public class TrackManagementServiceImpl implements TrackManagementService {
		int orderNum = 0;
		int maxDurationTime = 0;
		for (int i = list.size() - 1; i > -1; i--) {
		int listSize = list.size() - 1;
		for (int i=listSize ; i > -1; i--) {
			Map<String, Object> areaMap = new HashMap<String, Object>();
			String inTime = DateUtil.formatObjectToDate(list.get(i).get("inTime"));
			String outTime = DateUtil.formatObjectToDate(list.get(i).get("outTime"));
			if (orderNum == 0 && DateUtil.compareDate(inTime, startTime) > 0) {
			if (i == listSize && DateUtil.compareDate(inTime, startTime) > 0) {
				Map<String, Object> wharfAreaMap = getWharfAreaMap(startTime, inTime);
				maxDurationTime = (int) wharfAreaMap.get("durationTime");
				areaList.add(wharfAreaMap);
				orderNum++;
			} else if (orderNum == 0) {
			} else if (i == listSize) {
				inTime = startTime;
			} else {
				inTime = inTime == null ? outTime : inTime;
			}
			if (!fixToolTypeIds.contains(String.valueOf(list.get(i).get("businessType")))) {
				// 进入船上等可移动的设备中
			// 判断是否进入可移动的设备(船)
			/*if (!fixToolTypeIds.contains(String.valueOf(list.get(i).get("businessType")))) {
				continue;
			}
			}*/
			areaMap.put("orderNum", orderNum);
			areaMap.put("inTime", inTime);