修改单人轨迹时间抽

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

@@ -102,7 +102,7 @@ public class TrackManagementServiceImpl implements TrackManagementService {
					BigDecimal.ROUND_HALF_DOWN);
			traceMap.put("playDurationTime", proportionBigDecimal.intValue());
			if (toolRecordList==null||toolRecordList.size()<2) {
			if (toolRecordList == null || toolRecordList.size() < 2) {
				traceMap.put("toolIndex", 0);
			} else {
				do {
@@ -225,12 +225,9 @@ public class TrackManagementServiceImpl implements TrackManagementService {
		List<String> fixToolTypeIds = getFixToolTypeIds();
		if (CollectionUtils.isEmpty(list) || CollectionUtils.isEmpty(fixToolTypeIds)) {
			Map<String, Object> map = getWharfAreaMap(startTime);
			int diffMinute = DateUtil.getDifferenceMinute(startTime, endTime);
			map.put("durationTime", diffMinute < 1 ? 1 : diffMinute);
			map.put("proportion", 100);
			areaList.add(map);
			Map<String, Object> wharfAreaMap = getWharfAreaMap(startTime, endTime);
			wharfAreaMap.put("proportion", 100);
			areaList.add(wharfAreaMap);
			return areaList;
		}
@@ -239,25 +236,23 @@ public class TrackManagementServiceImpl implements TrackManagementService {
		for (int i = list.size() - 1; i > -1; i--) {
			Map<String, Object> areaMap = new HashMap<String, Object>();
			if (!fixToolTypeIds.contains(String.valueOf(list.get(i).get("businessType")))) {
				// 进入船上等可移动的设备中
				continue;
			}
			String inTime = DateUtil.formatObjectToDate(list.get(i).get("inTime"));
			String outTime = DateUtil.formatObjectToDate(list.get(i).get("outTime"));
			inTime = inTime == null ? outTime : inTime;
			if (orderNum == 0 && DateUtil.compareDate(inTime, startTime) > 0) {
				Map<String, Object> wharfAreaMap = getWharfAreaMap(startTime);
				int diffMinute = DateUtil.getDifferenceMinute(startTime, inTime);
				maxDurationTime = diffMinute;
				wharfAreaMap.put("durationTime", diffMinute);
				Map<String, Object> wharfAreaMap = getWharfAreaMap(startTime, inTime);
				maxDurationTime = (int) wharfAreaMap.get("durationTime");
				areaList.add(wharfAreaMap);
				orderNum++;
			} else if (orderNum == 0) {
				inTime = startTime;
			} else {
				inTime = inTime == null ? outTime : inTime;
			}
			if (!fixToolTypeIds.contains(String.valueOf(list.get(i).get("businessType")))) {
				// 进入船上等可移动的设备中
				continue;
			}
			areaMap.put("orderNum", orderNum);
@@ -312,14 +307,21 @@ public class TrackManagementServiceImpl implements TrackManagementService {
	/**
	 * 获取第一个为码头的围栏信息
	 * @param startTime
	 * @param startTime 进入码头的时间
	 * @param outTime 离开码头的时间
	 * @return
	 * @throws Exception 
	 */
	private Map<String, Object> getWharfAreaMap(String startTime) {
	private Map<String, Object> getWharfAreaMap(String startTime, String outTime) throws Exception {
		Map<String, Object> areaMap = new HashMap<String, Object>();
		areaMap.put("orderNum", 0);
		areaMap.put("inTime", startTime);
		areaMap.put("outTime", outTime);
		areaMap.put("areaName", "码头");
		int diffMinute = DateUtil.getDifferenceMinute(startTime, outTime);
		areaMap.put("durationTime", diffMinute < 1 ? 1 : diffMinute);
		return areaMap;
	}
}