Merge remote-tracking branch 'origin/master'

ebc-sea-platform/src/main/java/com/ai/ipu/server/controller/RescueController.java

@@ -35,7 +35,7 @@ public class RescueController {
	public JMap queryCurrentRescueLocationInfo(JMap params) throws Exception {
		JMap result = new JsonMap();
		List<Map<String, String>> resultList = rescueService.queryCurrentRescueLocationInfo(params);
		List<Map<String, Map<String, String>>> resultList = rescueService.queryCurrentRescueLocationInfo(params);
		result.put("dataList", resultList);
		return result;
	}

ebc-sea-platform/src/main/java/com/ai/ipu/server/dao/impl/RescueDaoImpl.java

@@ -72,9 +72,9 @@ public class RescueDaoImpl extends AbstractBizDao implements RescueDao {
	}
	@Override
	public List<Map<String, Object>> queryNoCloseRescueLog(List<String> deviceIdsList) throws Exception {
	public List<Map<String, Object>> queryNoCloseRescueLog(String deviceId) throws Exception {
		Map<String, Object> dataMap = new HashMap<String, Object>();
		dataMap.put("deviceIdsList", deviceIdsList);// 设备ID
		dataMap.put("deviceId", deviceId);// 设备ID
		dataMap.put("offlineType", EbcConstant.alarm_type_offline_ZH);// 不属于离线告警
		dataMap.put("alarmDataStatus", EbcConstant.data_status_valid);// 数据状态
@@ -127,4 +127,16 @@ public class RescueDaoImpl extends AbstractBizDao implements RescueDao {
		dataMap.put("LOG_ID", params.getString("alarmLogId"));
		return dao.delete("LR_RESCUE_LOG", dataMap) > 0;
	}
	
	@Override
	public List<Map<String, Object>> queryListRescuerInfo(JMap params, int pageNum, int pageSize) throws Exception {
		StringBuilder sql = new StringBuilder();
		
		sql.append(" SELECT RESCUERS_ID ID,PARTY_CODE CODE ,PARTY_NAME NAME  ");
		sql.append(" FROM LR_RESCUERS ");
		sql.append(" WHERE DATA_STATUS ='").append(EbcConstant.data_status_valid).append("' ");
		
		return dao.executeSelect(sql.toString(), pageNum, pageSize);
	}
	
}

ebc-sea-platform/src/main/java/com/ai/ipu/server/dao/interfaces/RescueDao.java

@@ -19,11 +19,11 @@ public interface RescueDao {
	/**
	 * 根据终端ID获取未关闭的报警救援日志
	 * @param deviceIdsList
	 * @param deviceId
	 * @return
	 * @throws Exception
	 */
	List<Map<String, Object>> queryNoCloseRescueLog(List<String> deviceIdsList) throws Exception;
	List<Map<String, Object>> queryNoCloseRescueLog(String deviceId) throws Exception;
	/**
	 * 查询单个报警救援日志
@@ -41,8 +41,6 @@ public interface RescueDao {
	 */
	String addRescueLog(Map<String, Object> dataMap) throws Exception;
	
	
	/**
	 * 修改报警救援日志
	 * @param dataMap
@@ -59,4 +57,14 @@ public interface RescueDao {
	 */
	boolean deleteRescueLog(JMap params) throws Exception;
	
	/**
	 * 获取救援者的下拉列表
	 * @param params
	 * @param pageNum 当前页数
	 * @param pageSize 每页条数
	 * @return
	 * @throws Exception
	 */
	List<Map<String, Object>> queryListRescuerInfo(JMap params, int pageNum, int pageSize) throws Exception;
	
}

ebc-sea-platform/src/main/java/com/ai/ipu/server/enums/UserEnums.java

@@ -1,17 +1,12 @@
package com.ai.ipu.server.enums;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.Map;
import org.springframework.util.ReflectionUtils;
public enum UserEnums {
	//工人
	// 工人
	oneUser(1, "张三", "1111", 1, 1, "zhangsan", "经理"), 
	twoUser(2, "李四", "2222", 1, 1, "lisi", "员工"),
	threeUser(3, "王五", "3333", 1, 1, "wangwu", "员工"), 
@@ -21,14 +16,14 @@ public enum UserEnums {
	sevenUser(7, "吴九", "7777", 1, 1, "wujiu", "员工"), 
	eightUser(8, "郑十", "8888", 1, 1, "zhengshi", "员工"),
	nineUser(0, "刘一", "9999", 1, 1, "liuyi", "员工"),
	//救援者
	oneRescuer(0, "童一", "1001", 2, 1, "tongyi", "员工"),
	twoRescuer(0, "童二", "1002", 2, 1, "tonger", "员工"),
	threeRescuer(0, "童三", "1003", 2, 1, "tongsan", "员工"),
	fourRescuer(0, "童四", "1004", 2, 1, "tongsi", "员工"),
	fiveRescuer(0, "童五", "1005", 2, 1, "tongwu", "员工"),
	sixRescuer(0, "童六", "1006", 2, 1, "tongliu", "员工");
	
	// 救援者
	oneRescuer(1, "童一", "1001", 2, 1, "tongyi", "员工"), 
	twoRescuer(2, "童二", "1002", 2, 1, "tonger", "员工"),
	threeRescuer(3, "童三", "1003", 2, 1, "tongsan", "员工"),
	fourRescuer(4, "童四", "1004", 2, 1, "tongsi", "员工"),
	fiveRescuer(5, "童五", "1005", 2, 1, "tongwu", "员工"), 
	sixRescuer(6, "童六", "1006", 2, 1, "tongliu", "员工");
	public int id; // id
	public String userName;// 姓名
	public String employeeNo;// 员工编号
@@ -41,8 +36,8 @@ public enum UserEnums {
	}
	private UserEnums(int id, String userName, String employeeNo, int department, int employeeType,
			String employeeCode, String duty) {
	private UserEnums(int id, String userName, String employeeNo, int department, int employeeType, String employeeCode,
			String duty) {
		this.id = id;
		this.userName = userName;
		this.employeeNo = employeeNo;
@@ -93,7 +88,7 @@ public enum UserEnums {
		}
		return null;
	}
	
	/**
	 * 根据员工编号返回枚举值
	 * @param id
@@ -109,79 +104,81 @@ public enum UserEnums {
	}
	/**
	 * 根据序号获取枚举数组中的值，序号必须从0开始
	 * @param id
	 * @return
	 * @throws IllegalAccessException
	 * @throws IllegalArgumentException
	 * @throws InvocationTargetException
	 * @throws InstantiationException
	 */
			* 根据序号获取枚举数组中的值，序号必须从0开始
			* @param id
			* @return
			* @throws IllegalAccessException
			* @throws IllegalArgumentException
			* @throws InvocationTargetException
			* @throws InstantiationException
			*/
	/*
	public static <T> List<T> getEumByKey(int id)
			throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, InstantiationException {
		List<String> enumList = getEumValueList();
		List<T> enumList1 = new ArrayList<T>();
		for (UserEnums testEnums : UserEnums.values()) {
			if (testEnums.getId() == id) {
				Class<?> clazz = testEnums.getClass();
				// 获取所有常量
				Object object = clazz.getEnumConstants()[id];
				Field[] filedFields = clazz.getFields();
				for (Field field : filedFields) {
					field.setAccessible(true);
					Object sssObject = field.get(object);
					if (enumList.contains(field.getName())) {
						continue;
					} else {
						if (sssObject != null)
							enumList1.add((T) sssObject);
					}
		throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, InstantiationException {
	List<String> enumList = getEumValueList();
	List<T> enumList1 = new ArrayList<T>();
	for (UserEnums testEnums : UserEnums.values()) {
		if (testEnums.getId() == id) {
			Class<?> clazz = testEnums.getClass();
			// 获取所有常量
			Object object = clazz.getEnumConstants()[id];
			Field[] filedFields = clazz.getFields();
			for (Field field : filedFields) {
				field.setAccessible(true);
				Object sssObject = field.get(object);
				if (enumList.contains(field.getName())) {
					continue;
				} else {
					if (sssObject != null)
						enumList1.add((T) sssObject);
				}
				return enumList1;
			}
			return enumList1;
		}
		return null;
	}
	/**
	 * 获取枚举值常量列表
	 * @param
	 * @return
	 */
	return null;
	}
	
	*//**
		* 获取枚举值常量列表
		* @param
		* @return
		*/
	/*
	public static List<String> getEumValueList() {
		List<String> list = new ArrayList<String>();
		for (Object object : UserEnums.values()) {
			list.add(object.toString());
		}
		return list;
	List<String> list = new ArrayList<String>();
	for (Object object : UserEnums.values()) {
		list.add(object.toString());
	}
	/**
	 * 传入方法名称  values是值 ，field是 字段mingcheng
	 * @param <T>
	 * @param enumType
	 * @param value
	 * @param field
	 * @return
	 * @throws Exception
	 */
	public static <T extends Enum<T>> T getEnumOnValue(Class<T> enumType, String value, String field) throws Exception {
		for (Object obj : enumType.getEnumConstants()) {
			Method m = obj.getClass().getDeclaredMethod("values", null);
			Object[] results = (Object[]) m.invoke(obj, null);
			for (Object result : results) {
				Field codeField = result.getClass().getDeclaredField(field);
				ReflectionUtils.makeAccessible(codeField);
				String fileValue = String.valueOf(ReflectionUtils.getField(codeField, result));
				if (fileValue.equals(value)) {
					return (T) result;
	return list;
	}
	
	*//**
		* 传入方法名称  values是值 ，field是 字段mingcheng
		* @param <T>
		* @param enumType
		* @param value
		* @param field
		* @return
		* @throws Exception
		*//*
			public static <T extends Enum<T>> T getEnumOnValue(Class<T> enumType, String value, String field) throws Exception {
			
			for (Object obj : enumType.getEnumConstants()) {
				Method m = obj.getClass().getDeclaredMethod("values", null);
				Object[] results = (Object[]) m.invoke(obj, null);
				for (Object result : results) {
					Field codeField = result.getClass().getDeclaredField(field);
					ReflectionUtils.makeAccessible(codeField);
					String fileValue = String.valueOf(ReflectionUtils.getField(codeField, result));
					if (fileValue.equals(value)) {
						return (T) result;
					}
			
				}
			}
		}
		return null;
	}
			return null;
			}*/
	/**
	 * 获取所有的用户放到list里
@@ -205,7 +202,7 @@ public enum UserEnums {
		}
		return list;
	}
	
	/**
	 * 按部门获取所有的用户放到list里
	 *
@@ -215,7 +212,7 @@ public enum UserEnums {
	public static List<Map<String, Object>> getUserListByDepy(int department) {
		ArrayList<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
		for (UserEnums userEnum : UserEnums.values()) {
			if (department==userEnum.getDepartment()) {
			if (department == userEnum.getDepartment()) {
				Map<String, Object> userMap = new HashMap<String, Object>();
				userMap.put("id", userEnum.getId());
				userMap.put("userName", userEnum.getUserName());
@@ -229,5 +226,5 @@ public enum UserEnums {
		}
		return list;
	}
	
}

ebc-sea-platform/src/main/java/com/ai/ipu/server/service/impl/DeviceManageServiceImpl.java

@@ -63,10 +63,10 @@ public class DeviceManageServiceImpl implements DeviceManageService {
			}
			if (bindDeviceBoolean) {
				//只查询绑定的终端：包含
				// 只查询绑定的终端：包含
				paramsMap.put("resourceIdList", deviceIds.toString());
			} else if (unBindDeviceBoolean) {
				//只查询不绑定的终端：不包含
				// 只查询不绑定的终端：不包含
				paramsMap.put("notIn", deviceIds.toString());
			}
		}
@@ -208,8 +208,13 @@ public class DeviceManageServiceImpl implements DeviceManageService {
		// 获取终端当前位置信息
		List<Map<String, String>> list = deviceManageDao.queryCurrentDeviceLocationInfo(deviceIdsList);
		if (list.isEmpty()) {
			logger.info("未查询到设备位置信息");
			return new ArrayList();
		}
		// 查询当前所有未关闭的求救信息
		List<Map<String, Object>> alarmMapList = rescueDao.queryNoCloseRescueLog(deviceIdsList);
		List<Map<String, Object>> alarmMapList = rescueDao.queryNoCloseRescueLog(null);
		// 查询人员所在围栏信息
		List<String> mapTagTypeList = new ArrayList<String>();
@@ -223,71 +228,83 @@ public class DeviceManageServiceImpl implements DeviceManageService {
		for (Map<String, String> map : list) {
			String deviceId = map.get("deviceId");
			map.put("locationStatus", EbcConstant.location_status_normal);// 定位状态
			
			boolean flag = true;
			
			// 人员名称
			for (Map<String, Object> bindDeviceMap : bindUserDeviceList) {
				if (deviceId.equals(String.valueOf(bindDeviceMap.get("DEVICE_ID")))) {
					map.put("userName", String.valueOf(bindDeviceMap.get("NAME")));
					map.put("userCode", String.valueOf(bindDeviceMap.get("CODE")));
					break;
				}
			}
			
			//离线信息
			if (map.get("alarmType")!=null&&EbcConstant.alarm_type_offline_beidou==Integer.parseInt(String.valueOf(map.get("alarmType")))) {
				map.put("locationStatus",EbcConstant.location_status_offline);//定位状态
				map.put("alarmType",EbcConstant.alarm_type_offline_ZH);//报警类型
			// 离线信息
			if (map.get("alarmType") != null && EbcConstant.alarm_type_offline_beidou == Integer
					.parseInt(String.valueOf(map.get("alarmType")))) {
				map.put("locationStatus", EbcConstant.location_status_offline);// 定位状态
				map.put("alarmType", EbcConstant.alarm_type_offline_ZH);// 报警类型
				flag = false;
			}
			
			// 求救信息
			if (alarmMapList != null && flag) {
			if (flag && alarmMapList != null && !alarmMapList.isEmpty()) {
				for (int i = 0; i < alarmMapList.size() && flag; i++) {
					Map<String, Object> alarmMap = alarmMapList.get(i);
					
					// 判断是救援者还是求救者
					if (deviceId.equals(String.valueOf(alarmMap.get("DEVICE_ID")))) {
						// 求救时间
						String alarmDate = String.valueOf(alarmMap.get("CALLER_DATE"));
						map.put("alarmDate", DateUtil.formatStrDate(alarmDate));
							// 求救者
							// 求救时间
							String alarmDate = String.valueOf(alarmMap.get("CALLER_DATE"));
							map.put("alarmDate", DateUtil.formatStrDate(alarmDate));
							// 计算求救时长
							int alarmLong = DateUtil.getDifferenceMinute(alarmDate, map.get("newDate"));
							map.put("alarmLong", String.valueOf(alarmLong));
							if (alarmMap.get("RESCUERS_ID") == null) {
								// 未指派救援人员
								map.put("isNewAlarm", EbcConstant.alarm_status_needassign);
							} else {
								// 已指派救援人员
								map.put("isNewAlarm", EbcConstant.alarm_status_needclose);
								// map.put("rescuerDeviceId", String.valueOf(alarmMap.get("RESCUER_DEVICE_ID")));//救援者的设备ID
							}
						// 计算求救时长
						int alarmLong = DateUtil.getDifferenceMinute(alarmDate, map.get("newDate"));
						map.put("alarmLong", String.valueOf(alarmLong));
						
						if (alarmMap.get("RESCUERS_ID")==null) {
							//未指派救援人员
							params.put("isNewAlarm", EbcConstant.alarm_status_needassign);
						}else {
							//已指派救援人员
							params.put("isNewAlarm", EbcConstant.alarm_status_needclose);
						}
						
						//求救记录ID
						params.put("alarmLogId", alarmMap.get("LOG_ID"));
						//定位状态
						switch (String.valueOf(alarmMap.get("ALARM_TYPE"))) {
						case EbcConstant.alarm_type_autosos_ZH:
							//自动报警
							map.put("locationStatus",EbcConstant.location_status_autosos);
							map.put("alarmType",EbcConstant.alarm_type_autosos_ZH);
							break;
						case EbcConstant.alarm_type_jogsos_ZH:
							//手动报警
							map.put("locationStatus",EbcConstant.location_status_jogsos);
							map.put("alarmType",EbcConstant.alarm_type_jogsos_ZH);
							break;
						default:
							break;
						}
							// 求救记录ID
							map.put("alarmLogId", String.valueOf(alarmMap.get("LOG_ID")));
							// 定位状态
							switch (String.valueOf(alarmMap.get("ALARM_TYPE"))) {
							case EbcConstant.alarm_type_autosos_ZH:
								// 自动报警
								map.put("locationStatus", EbcConstant.location_status_autosos);
								map.put("alarmType", EbcConstant.alarm_type_autosos_ZH);
								break;
							case EbcConstant.alarm_type_jogsos_ZH:
								// 手动报警
								map.put("locationStatus", EbcConstant.location_status_jogsos);
								map.put("alarmType", EbcConstant.alarm_type_jogsos_ZH);
								break;
							default:
								break;
							}
						flag = false;
						
					}else if(deviceId.equals(String.valueOf(alarmMap.get("RESCUER_DEVICE_ID")))){
						// 救援者
						map.put("locationStatus", EbcConstant.location_status_rescuer);// 定位状态
						// map.put("alarmDeviceId", String.valueOf(alarmMap.get("DEVICE_ID"))); // 求救者的设备ID
						flag = false;
					}
				}
			}
			// 违规信息
			if (areaViolationMapList != null && flag) {
			if (flag && areaViolationMapList != null && !areaViolationMapList.isEmpty()) {
				int maxMapTagGrade = 0; // 围栏优先级(电子围栏5>定点3>考勤1、作业1)
				long minInAreaLong = System.currentTimeMillis();// 进入围栏最早的时间戳
				Map<String, Object> areaInfoMap = null;// 用于计算时间的围栏信息
@@ -331,7 +348,8 @@ public class DeviceManageServiceImpl implements DeviceManageService {
				} else if (maxMapTagGrade == 3) {
					// 进入定点(限时)，需计算是否超时
					int fixedLong = DateUtil.getDifferenceMinute(String.valueOf(areaInfoMap.get("IN_DATE")), map.get("newDate"));
					int fixedLong = DateUtil.getDifferenceMinute(String.valueOf(areaInfoMap.get("IN_DATE")),
							map.get("newDate"));
					if (fixedLong > 0) {
						// 围栏要求定点时间
@@ -350,35 +368,35 @@ public class DeviceManageServiceImpl implements DeviceManageService {
		return list;
	}
	
	@Override
	public JMap queryOneDeviceLocationInfo(JMap params, int pageNum, int pageSize) throws Exception {
		JMap resultJMap=new JsonMap();
		String beginTime=null;//开始时间
		String endTime=null;//结束时间
		
		//时间段类型
		JMap resultJMap = new JsonMap();
		String beginTime = null;// 开始时间
		String endTime = null;// 结束时间
		// 时间段类型
		switch (params.getString("timeType")) {
		case EbcConstant.locus_time_interval_tenMinute:
			//10分钟
			endTime=TimeUtil.getSysTime();
			beginTime=DateUtil.dateAddMinute(endTime, -10);
			// 10分钟
			endTime = TimeUtil.getSysTime();
			beginTime = DateUtil.dateAddMinute(endTime, -10);
			break;
		case EbcConstant.locus_time_interval_oneHour:
			//1小时
			endTime=TimeUtil.getSysTime();
			beginTime=DateUtil.dateAddHour(endTime, -1);
			// 1小时
			endTime = TimeUtil.getSysTime();
			beginTime = DateUtil.dateAddHour(endTime, -1);
			break;
		case EbcConstant.locus_time_interval_oneDay:
			//1天
			endTime=TimeUtil.getSysTime();
			beginTime=DateUtil.dateAddDay(endTime, -1);
			// 1天
			endTime = TimeUtil.getSysTime();
			beginTime = DateUtil.dateAddDay(endTime, -1);
			break;
		case EbcConstant.locus_time_interval_custom:
			//自定义
			beginTime=params.getString("beginTime");
			endTime=params.getString("endTime");
			if (beginTime==null||"".equals(beginTime)||endTime==null||"".equals(endTime)) {
			// 自定义
			beginTime = params.getString("beginTime");
			endTime = params.getString("endTime");
			if (beginTime == null || "".equals(beginTime) || endTime == null || "".equals(endTime)) {
				resultJMap.put("result", false);
				resultJMap.put("errMsg", "日期不能为空");
				return resultJMap;
@@ -389,13 +407,13 @@ public class DeviceManageServiceImpl implements DeviceManageService {
			resultJMap.put("errMsg", "时间段无效");
			return resultJMap;
		}
		
		Map<String, String> paramsMap = new HashMap<String, String>();
		paramsMap.put("resourceId", params.getString("deviceId"));//终端ID
		paramsMap.put("resourceId", params.getString("deviceId"));// 终端ID
		paramsMap.put("startTime", beginTime);
		paramsMap.put("endTime", endTime);
		
		resultJMap= deviceManageDao.queryOneDeviceLocationInfo(paramsMap, pageNum, pageSize);
		resultJMap = deviceManageDao.queryOneDeviceLocationInfo(paramsMap, pageNum, pageSize);
		return resultJMap;
	}

ebc-sea-platform/src/main/java/com/ai/ipu/server/service/impl/RescueServiceImpl.java

@@ -5,6 +5,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.websocket.Session;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -18,19 +22,19 @@ import com.ai.ipu.server.util.EbcConstant;
@Service
public class RescueServiceImpl implements RescueService {
	Logger logger = LoggerFactory.getLogger(RescueServiceImpl.class);
	@Autowired
	RescueDao rescueDao;
	
	@Autowired
	DeviceManageDao deviceManageDao;
	@Override
	public List<Map<String, Object>> queryListRescuerInfo(JMap params, int pageNum, int pageSize) throws Exception {
		// TODO 调用uspa接口获取人员信息 暂时用枚举(救援的部门为2)
		return UserEnums.getUserListByDepy(2);
		return rescueDao.queryListRescuerInfo(params, pageNum, pageSize);
	}
	
	@Override
	public boolean assignRescuer(JMap params) throws Exception {
		// 修改最后定位时间
@@ -51,8 +55,7 @@ public class RescueServiceImpl implements RescueService {
	@Override
	public JMap queryPageRescueLog(JMap params, int pageNum, int pageSize) throws Exception {
		//TODO 计算求救时间、按时间查询
		
		// TODO 计算求救时间、按时间查询
		
		return rescueDao.queryPageRescueLog(params, pageNum, pageSize);
	}
@@ -63,91 +66,126 @@ public class RescueServiceImpl implements RescueService {
	}
	@Override
	public List<Map<String, String>> queryCurrentRescueLocationInfo(JMap params) throws Exception {
	public List<Map<String, Map<String, String>>> queryCurrentRescueLocationInfo(JMap params) throws Exception {
		// 查询当前所有未关闭的求救信息
		List<Map<String, Object>> alarmMapList = rescueDao.queryNoCloseRescueLog(null);
		
		if (alarmMapList == null || alarmMapList.isEmpty()) {
			logger.info("未查询到未关闭的求救信息");
			return new ArrayList();
		}
		List<String> deviceIdsList = new ArrayList<String>();
		for (int i = 0; i < alarmMapList.size(); i++) {
			deviceIdsList.add(String.valueOf(alarmMapList.get(i).get("DEVICE_ID")));
			if (alarmMapList.get(i).get("RESCUER_DEVICE_ID")!=null) {
			if (alarmMapList.get(i).get("RESCUER_DEVICE_ID") != null) {
				deviceIdsList.add(String.valueOf(alarmMapList.get(i).get("RESCUER_DEVICE_ID")));
			}
		}
		
		// 获取终端当前位置信息
		List<Map<String, String>> list = deviceManageDao.queryCurrentDeviceLocationInfo(deviceIdsList);
		List<Map<String, String>> deviceList = deviceManageDao.queryCurrentDeviceLocationInfo(deviceIdsList);
		if (deviceList.isEmpty()) {
			logger.info("未查询到设备位置信息");
			return new ArrayList();
		}
		// 拼接返回数据
		for (Map<String, String> map : list) {
			String deviceId = map.get("deviceId");
			boolean flag=true; //是否为救援人员
			
			for (int i = 0; i < alarmMapList.size()&&flag; i++) {
				Map<String, Object> alarmMap = alarmMapList.get(i);
				if (deviceId.equals(String.valueOf(alarmMap.get("DEVICE_ID")))) {
					//拼接报警人员的信息
					//员工姓名
					map.put("userName", String.valueOf(alarmMap.get("PARTY_NAME")));
					
		List<Map<String, Map<String, String>>> resultList = new ArrayList<Map<String, Map<String, String>>>();
		for (Map<String, Object> alarmMap : alarmMapList) {
			Map<String, Map<String, String>> resultDataMap = new HashMap<String, Map<String, String>>();
			String alarmDeviceId = String.valueOf(alarmMap.get("DEVICE_ID"));// 求救者的设备ID
			String rescuerDeviceId = null;// 救援者的设备ID
			// 求救者的设备ID
			int countBreakLoop = 0; // 统计需跳出循环的数量
			int sumBreakLoop = 1; // 跳出循环的总数量
			if (alarmMap.get("RESCUERS_ID") != null) {
				// 有救援者
				rescuerDeviceId = String.valueOf(alarmMap.get("RESCUER_DEVICE_ID"));
				sumBreakLoop = 2;
			}
			for (Map<String, String> deviceMap : deviceList) {
				String deviceId = deviceMap.get("deviceId");
				if (deviceId.equals(alarmDeviceId)) {
					// 求救者
					// 员工姓名
					deviceMap.put("userName", String.valueOf(alarmMap.get("PARTY_NAME")));// 员工姓名
					deviceMap.put("userCode", String.valueOf(alarmMap.get("PARTY_CODE")));// 员工编号
					// 求救时间
					String alarmDate = String.valueOf(alarmMap.get("CALLER_DATE"));
					map.put("alarmDate", DateUtil.formatStrDate(alarmDate));
					deviceMap.put("alarmDate", DateUtil.formatStrDate(alarmDate));
					// 计算求救时长
					int alarmLong = DateUtil.getDifferenceMinute(alarmDate, map.get("newDate"));
					map.put("alarmLong", String.valueOf(alarmLong));
					
					if (alarmMap.get("RESCUERS_ID")==null) {
						//未指派救援人员
						map.put("isNewAlarm", EbcConstant.alarm_status_needassign);
					}else {
						//已指派救援人员
						map.put("isNewAlarm", EbcConstant.alarm_status_needclose);
						map.put("rescuerDeviceId", String.valueOf(alarmMap.get("RESCUER_DEVICE_ID")));
					int alarmLong = DateUtil.getDifferenceMinute(alarmDate, deviceMap.get("newDate"));
					deviceMap.put("alarmLong", String.valueOf(alarmLong));
					if (alarmMap.get("RESCUERS_ID") == null) {
						// 未指派救援人员
						deviceMap.put("isNewAlarm", EbcConstant.alarm_status_needassign);
					} else {
						// 已指派救援人员
						deviceMap.put("isNewAlarm", EbcConstant.alarm_status_needclose);
						deviceMap.put("rescuerDeviceId", String.valueOf(alarmMap.get("RESCUER_DEVICE_ID")));// 救援者的设备ID
					}
					
					//求救记录ID
					map.put("alarmLogId", String.valueOf(alarmMap.get("LOG_ID")));
					//定位状态
					// 求救记录ID
					deviceMap.put("alarmLogId", String.valueOf(alarmMap.get("LOG_ID")));
					// 定位状态
					switch (String.valueOf(alarmMap.get("ALARM_TYPE"))) {
					case EbcConstant.alarm_type_autosos_ZH:
						//自动报警
						map.put("locationStatus",EbcConstant.location_status_autosos);//定位状态
						map.put("alarmType",EbcConstant.alarm_type_autosos_ZH);
						// 自动报警
						deviceMap.put("locationStatus", EbcConstant.location_status_autosos);// 定位状态
						deviceMap.put("alarmType", EbcConstant.alarm_type_autosos_ZH);
						break;
					case EbcConstant.alarm_type_jogsos_ZH:
						//手动报警
						map.put("locationStatus",EbcConstant.location_status_jogsos);//定位状态
						map.put("alarmType",EbcConstant.alarm_type_jogsos_ZH);
						// 手动报警
						deviceMap.put("locationStatus", EbcConstant.location_status_jogsos);// 定位状态
						deviceMap.put("alarmType", EbcConstant.alarm_type_jogsos_ZH);
						break;
					default:
						break;
					}
					
					break;
					
				}else if (deviceId.equals(String.valueOf(alarmMap.get("RESCUER_DEVICE_ID")))) {
					//拼接救援人员的信息
					map.put("locationStatus",EbcConstant.location_status_rescuer);//定位状态
					map.put("userName", String.valueOf(alarmMap.get("RESCUER_NAME")));//员工姓名
					break;
					
					resultDataMap.put("alarm", deviceMap);
					countBreakLoop++;
					if (countBreakLoop == sumBreakLoop) {
						// 求救者和救援者的信息都已找到，结束设备位置的循环
						break;
					}
				} else if (rescuerDeviceId != null && deviceId.equals(rescuerDeviceId)) {
					// 救援者
					deviceMap.put("locationStatus", EbcConstant.location_status_rescuer);// 定位状态
					deviceMap.put("userName", String.valueOf(alarmMap.get("RESCUER_NAME")));// 员工姓名
					deviceMap.put("userCode", String.valueOf(alarmMap.get("RESCUER_CODE")));// 员工编号
					deviceMap.put("alarmLogId", String.valueOf(alarmMap.get("LOG_ID")));// 求救记录ID
					deviceMap.put("alarmDeviceId", String.valueOf(alarmMap.get("DEVICE_ID")));// 求救者的设备ID
					resultDataMap.put("rescuer", deviceMap);
					countBreakLoop++;
					if (countBreakLoop == sumBreakLoop) {
						// 求救者和救援者的信息都已找到，结束设备位置的循环
						break;
					}
				}
			}
			resultList.add(resultDataMap);
		}
		
		return list;
		return resultList;
	}
	
	@Override
	public JMap queryOneRescuePlayback(JMap params, int pageNum, int pageSize) {
		//TODO
		
		
		
		
		// TODO
		return null;
	}

ebc-sea-platform/src/main/java/com/ai/ipu/server/service/interfaces/RescueService.java

@@ -43,7 +43,7 @@ public interface RescueService {
	 * @param params
	 * @return
	 */
	List<Map<String, String>> queryCurrentRescueLocationInfo(JMap params) throws Exception;
	List<Map<String, Map<String, String>>> queryCurrentRescueLocationInfo(JMap params) throws Exception;
	/**
	 * 获取救援者的下拉列表

ebc-sea-platform/src/main/java/com/ai/ipu/server/service/iotdata/ManageIotNoCloseAlarmData.java

@@ -26,26 +26,55 @@ public class ManageIotNoCloseAlarmData {
	public boolean executeReceiveIotData(JMap params) throws Exception {
		// 查询是否为未被救援的人员
		List<String> deviceIdsList = new ArrayList<String>();
		deviceIdsList.add(params.getString("deviceId"));
		List<Map<String, Object>> alarmList = rescueDao.queryNoCloseRescueLog(deviceIdsList);
		List<Map<String, Object>> alarmList = rescueDao.queryNoCloseRescueLog(params.getString("deviceId"));
		if (alarmList == null || alarmList.isEmpty()) {
			return false;
		}
		logger.info("定位信息为已报警人员: " + params.get("userName"));
		// 推送镜屏
		sendMirrorData(params, alarmList.get(0));
		// 修改最后定位时间
		updateLastLocationRecord(params, alarmList.get(0));
		//判断是救援者还是求救者
		if (params.getString("userCode").equals(String.valueOf(alarmList.get(0).get("RESCUER_CODE")))) {
			//救援者
			logger.info("定位信息为救援人员: " + params.getString("userName"));
			
			// 推送镜屏
			sendRescuerMirrorData(params, alarmList.get(0));
			
		}else {
			//求救者
			logger.info("定位信息为已求救的人员: " + params.getString("userName"));
			
			// 推送镜屏
			sendAlarmMirrorData(params, alarmList.get(0));
			// 修改最后定位时间
			updateLastLocationRecord(params, alarmList.get(0));
		}
		return true;
	}
	private void sendMirrorData(JMap params, Map<String, Object> alarmMap) throws ParseException {
	/**
	 * 推送救援者的镜屏信息
	 * @param params
	 * @param alarmMap
	 * @throws ParseException
	 */
	private void sendRescuerMirrorData(JMap params, Map<String, Object> alarmMap) throws ParseException {
		params.put("locationStatus", EbcConstant.location_status_rescuer);// 定位状态
		params.put("alarmDeviceId", String.valueOf(alarmMap.get("DEVICE_ID"))); //求救者的设备ID
		
		// 推送镜屏
		MirrorSendDateUtil.sendData(MirrorSendDateUtil.topic_personnel, params);
	}
	
	/**
	 * 推送求救者的镜屏信息
	 * @param params
	 * @param alarmMap
	 * @throws ParseException
	 */
	private void sendAlarmMirrorData(JMap params, Map<String, Object> alarmMap) throws ParseException {
		// 求救时间
		String alarmDate = String.valueOf(alarmMap.get("CALLER_DATE"));
		params.put("alarmDate", DateUtil.formatStrDate(alarmDate));
@@ -59,7 +88,7 @@ public class ManageIotNoCloseAlarmData {
		if (EbcConstant.alarm_type_jogsos_ZH.equals(alarmType)) {
			params.put("locationStatus", EbcConstant.location_status_jogsos);// 定位状态
		} else if (EbcConstant.alarm_type_autosos_ZH.equals(alarmType)) {
			params.put("locationStatus", EbcConstant.location_status_autosos);// 报警类型
			params.put("locationStatus", EbcConstant.location_status_autosos);// 定位状态
		}
		if (alarmMap.get("RESCUERS_ID")==null) {
@@ -68,6 +97,7 @@ public class ManageIotNoCloseAlarmData {
		}else {
			//已指派救援人员
			params.put("isNewAlarm", EbcConstant.alarm_status_needclose);
			params.put("rescuerDeviceId", String.valueOf(alarmMap.get("RESCUER_DEVICE_ID"))); //救援者的设备ID
		}
		
		//求救记录ID

ebc-sea-platform/src/main/java/com/ai/ipu/server/util/DateUtil.java

@@ -37,58 +37,64 @@ public class DateUtil {
	 * @param dateStr
	 * @param amount
	 * @return yyyy-MM-dd HH:mm:ss
	 * @throws ParseException 
	 */
	public static String dateAddYear(String dateStr, int amount) {
	public static String dateAddYear(String dateStr, int amount) throws ParseException {
		return dateAdd(dateStr, Calendar.YEAR, amount, NORM_DATETIME_PATTERN);
	}
	
	/**
	 * 在原日期加月数
	 * @param dateStr
	 * @param amount
	 * @return yyyy-MM-dd HH:mm:ss
	 * @throws ParseException 
	 */
	public static String dateAddMonth(String dateStr, int amount) {
	public static String dateAddMonth(String dateStr, int amount) throws ParseException {
		return dateAdd(dateStr, Calendar.MONTH, amount, NORM_DATETIME_PATTERN);
	}
	
	/**
	 * 在原日期加天数
	 * @param dateStr
	 * @param amount
	 * @return yyyy-MM-dd HH:mm:ss
	 * @throws ParseException 
	 */
	public static String dateAddDay(String dateStr, int amount) {
	public static String dateAddDay(String dateStr, int amount) throws ParseException {
		return dateAdd(dateStr, Calendar.DATE, amount, NORM_DATETIME_PATTERN);
	}
	
	/**
	 * 在原日期加小时数
	 * @param dateStr
	 * @param amount
	 * @return yyyy-MM-dd HH:mm:ss
	 * @throws ParseException 
	 */
	public static String dateAddHour(String dateStr, int amount) {
	public static String dateAddHour(String dateStr, int amount) throws ParseException {
		return dateAdd(dateStr, Calendar.HOUR, amount, NORM_DATETIME_PATTERN);
	}
	
	/**
	 * 在原日期加分钟数
	 * @param dateStr
	 * @param amount
	 * @return yyyy-MM-dd HH:mm:ss
	 * @throws ParseException 
	 */
	public static String dateAddMinute(String dateStr, int amount) {
	public static String dateAddMinute(String dateStr, int amount) throws ParseException {
		return dateAdd(dateStr, Calendar.MINUTE, amount, NORM_DATETIME_PATTERN);
	}
	
	/**
	 * 在原日期加秒数
	 * @param dateStr
	 * @param amount
	 * @return yyyy-MM-dd HH:mm:ss
	 * @throws ParseException 
	 */
	public static String dateAddSecond(String dateStr, int amount) {
	public static String dateAddSecond(String dateStr, int amount) throws ParseException {
		return dateAdd(dateStr, Calendar.SECOND, amount, NORM_DATETIME_PATTERN);
	}
@@ -99,8 +105,9 @@ public class DateUtil {
	 * @param amount 间隔长度
	 * @param pattern 返回日期格式
	 * @return
	 * @throws ParseException 
	 */
	public static String dateAdd(String dateStr, int field, int amount, String pattern) {
	public static String dateAdd(String dateStr, int field, int amount, String pattern) throws ParseException {
		Date date = convertDate(dateStr);
		Date newDate = dateAdd(date, field, amount);
		return formatDate(newDate, pattern);
@@ -125,8 +132,9 @@ public class DateUtil {
	 * @param field Calendar中的时间类型
	 * @param amount 间隔长度
	 * @return
	 * @throws ParseException 
	 */
	public static Date dateAdd(String dateStr, int field, int amount) {
	public static Date dateAdd(String dateStr, int field, int amount) throws ParseException {
		Date date = convertDate(dateStr);
		return dateAdd(date, field, amount);
	}
@@ -149,9 +157,22 @@ public class DateUtil {
	 * 比较日期大小
	 * @param dateStr0
	 * @param dateStr1
	 * @return
	 * @return dateStr0<dateStr1 ? -1 : (dateStr0==dateStr1 ? 0 : 1)
	 * @throws ParseException 
	 */
	public static int compareDate(String dateStr0, String dateStr1) {
	public static int compareDate(String dateStr0, String dateStr1) throws ParseException {
		if (dateStr0 == null || "".equals(dateStr0)) {
			if (dateStr1 == null || "".equals(dateStr1)) {
				return 0;
			} else {
				return -1;
			}
		}
		if (dateStr1 == null || "".equals(dateStr1)) {
			return 1;
		}
		Date date1 = convertDate(dateStr0);
		Date date2 = convertDate(dateStr1);
		int result = date1.compareTo(date2);
@@ -162,8 +183,9 @@ public class DateUtil {
	 * 格式化字符串时间
	 * @param date
	 * @return yyyy-MM-dd HH:mm:ss
	 * @throws ParseException 
	 */
	public static String formatStrDate(String dateStr) {
	public static String formatStrDate(String dateStr) throws ParseException {
		Date date = convertDate(dateStr);
		return formatDate(date, DateUtil.NORM_DATETIME_PATTERN);
	}
@@ -196,11 +218,13 @@ public class DateUtil {
	 * 字符串转时间
	 * @param dateStr
	 * @return
	 * @throws ParseException 
	 */
	public static Date convertDate(String dateStr) {
	public static Date convertDate(String dateStr) throws ParseException {
		if (dateStr == null || "".equals(dateStr)) {
			return null;
		}
		String pattern = TimeUtil.getTimestampFormat(dateStr);
		return convertDate(dateStr, pattern);
	}
@@ -210,8 +234,9 @@ public class DateUtil {
	 * @param dateStr
	 * @param pattern
	 * @return
	 * @throws ParseException 
	 */
	public static Date convertDate(String dateStr, String pattern) {
	public static Date convertDate(String dateStr, String pattern) throws ParseException {
		if (dateStr == null || "".equals(dateStr)) {
			return null;
		}
@@ -221,12 +246,7 @@ public class DateUtil {
		}
		SimpleDateFormat formatter = new SimpleDateFormat(pattern);
		Date date = null;
		try {
			date = formatter.parse(dateStr);
		} catch (ParseException e) {
			e.printStackTrace();
		}
		Date date = formatter.parse(dateStr);
		return date;
	}

ebc-sea-platform/src/main/java/com/ai/ipu/server/util/EbcConstant.java

@@ -72,21 +72,21 @@ public class EbcConstant {
	// 人员定位状态：救援人员
	public static final String location_status_rescuer = "6";
	// 告警类型：SOS(手动)
	public static final int alarm_type_jogsos_beidou = 2;
	// 告警类型：SOS(自动)
	public static final int alarm_type_autosos_beidou = 1;
	
	// 告警类型：SOS(手动)
	public static final int alarm_type_jogsos_beidou = 2;
	// 告警类型：离线
	public static final int alarm_type_offline_beidou = 4;
	// 告警类型：SOS(手动)
	public static final String alarm_type_jogsos_ZH = "手动告警";
	// 告警类型：SOS(自动)
	public static final String alarm_type_autosos_ZH = "落水告警";
	// 告警类型：SOS(手动)
	public static final String alarm_type_jogsos_ZH = "手动告警";
	// 告警类型：离线
	public static final String alarm_type_offline_ZH = "离线告警";

ebc-sea-platform/src/main/java/com/ai/ipu/server/util/HttpServiceUtil.java

@@ -189,21 +189,20 @@ public class HttpServiceUtil {
	public static String sendGet(String url, Charset encoding) {
		HttpClient httpClient = HttpClients.createDefault();
		String resp = "";
		HttpGet httpGet = new HttpGet(url);
		httpGet.addHeader(HTTP.CONTENT_TYPE, HTTP_CONTENT_TYPE_JSON);
		CloseableHttpResponse response = null;
		try {
			response = (CloseableHttpResponse) httpClient.execute(httpGet);
		} catch (IOException e) {
			log.error("请求错误");
		} catch (Exception e) {
			log.error("sendGet Exception: " + e.getMessage());
			return "{}";
		}
		return responseEx(httpClient, response, encoding);
	}
	public static String sendPost(String url, Map<String, Object> paramsMap, Charset encoding) {
		HttpClient httpClient = HttpClients.createDefault();
		String resp = "";
		HttpPost httpPost = new HttpPost(url);
		httpPost.addHeader(HTTP.CONTENT_TYPE, HTTP_CONTENT_TYPE_JSON);
		if (paramsMap != null && paramsMap.size() > 0) {
@@ -213,8 +212,9 @@ public class HttpServiceUtil {
		CloseableHttpResponse response = null;
		try {
			response = (CloseableHttpResponse) httpClient.execute(httpPost);
		} catch (IOException e) {
			log.error("sendPost Exception: ", e.getMessage());
		} catch (Exception e) {
			log.error("sendPost Exception: " + e.getMessage());
			return "{}";
		}
		return responseEx(httpClient, response, encoding);
	}
@@ -222,7 +222,6 @@ public class HttpServiceUtil {
	public static String sendPost(String url, Map<String, Object> paramsMap, Charset encoding,
			Map<String, String> headerMap) {
		HttpClient httpClient = HttpClients.createDefault();
		String resp = "";
		HttpPost httpPost = new HttpPost(url);
		Iterator<String> iter = headerMap.keySet().iterator();
@@ -236,15 +235,16 @@ public class HttpServiceUtil {
		httpPost.addHeader(HTTP.CONTENT_TYPE, HTTP_CONTENT_TYPE_JSON);
		if (paramsMap != null && paramsMap.size() > 0) {
			log.debug("调用北向接口：url= "+url+",参数= "+JSONObject.toJSONString(paramsMap));
			log.debug("调用北向接口：url= " + url + ",参数= " + JSONObject.toJSONString(paramsMap));
			StringEntity se = new StringEntity(JSONObject.toJSONString(paramsMap), encoding);
			httpPost.setEntity(se);
		}
		CloseableHttpResponse response = null;
		try {
			response = (CloseableHttpResponse) httpClient.execute(httpPost);
		} catch (IOException e) {
			log.error("sendPost Exception: ", e.getMessage());
		} catch (Exception e) {
			log.error("sendPost Exception: " + e.getMessage());
			return "{}";
		}
		return responseEx(httpClient, response, encoding);
	}
@@ -261,8 +261,9 @@ public class HttpServiceUtil {
		CloseableHttpResponse response = null;
		try {
			response = (CloseableHttpResponse) httpClient.execute(httpPut);
		} catch (IOException e) {
			log.error("请求错误");
		} catch (Exception e) {
			log.error("sendPut Exception: " + e.getMessage());
			return "{}";
		}
		return responseEx(httpClient, response, encoding);
@@ -275,13 +276,13 @@ public class HttpServiceUtil {
				resp = EntityUtils.toString(response.getEntity(), encoding);
			}
		} catch (Exception e) {
			log.error(e.getMessage(), e);
			log.error("responseEx Exception: " + e.getMessage());
		} finally {
			if (response != null) {
				try {
					response.close();
				} catch (IOException e) {
					log.error(e.getMessage(), e);
				} catch (Exception e) {
					log.error("responseEx Exception: " + e.getMessage());
				}
			}
		}

ebc-sea-platform/src/main/java/com/ai/ipu/server/util/NorthboundInterfaceUtil.java

@@ -25,16 +25,16 @@ public class NorthboundInterfaceUtil {
	@Value("${aap.iot.userCode}")
	private String userCode;
	
	@Value("${aap.iot.passWord}")
	private String passWord;
	
	@Value("${url.iot.login}")
	private String iotLoginUrl;
	
	@Value("${url.iot.service}")
	private String iotServiceUrl;
	
	// 定义静态存储map空间存放sign与sessionId
	private volatile static Map<String, String> cacheMap = new ConcurrentHashMap<String, String>();// 缓存map
@@ -71,18 +71,25 @@ public class NorthboundInterfaceUtil {
		// 调用北向服务的接口
		logger.debug("GET调用北向接口");
		boolean loginFlag = true;
		// 1.在缓存中获取sessionId与sign
		Map<String, String> mapCache = getMapCache();
		if (mapCache.isEmpty() || mapCache.get("sign") == null || mapCache.get("session_id") == null) {
			// 2.如果没有调用登录接口从新获取
			iotLogin();
			loginFlag = iotLogin();
		}
		if (!loginFlag) {
			logger.debug("调用北向接口登录失败");
			return new HashMap<String, String>();
		}
		// 3.调用北向服务接口
		// (1)设置字符集
		Charset charset = Charset.forName("utf-8");
		// (2)调用接口
		String resultJson = HttpServiceUtil.sendGet(iotServiceUrl+url, charset);
		String resultJson = HttpServiceUtil.sendGet(iotServiceUrl + url, charset);
		// (3)将参数转为Map<String,String>【将返回值统一为String】
		Map<String, String> resultMap = JSON.parseObject(resultJson, Map.class);
@@ -93,15 +100,31 @@ public class NorthboundInterfaceUtil {
			// (1)清除缓存
			clear();
			// (2)重新登录
			iotLogin();
			// (3)再次调用接口
			String fianlresultJson = HttpServiceUtil.sendGet(iotServiceUrl+url, charset);
			// (4)获取返回值
			resultMap = JSON.parseObject(fianlresultJson, Map.class);
			loginFlag = iotLogin();
			if (!loginFlag) {
				logger.debug("再次调用北向接口登录失败");
				return new HashMap<String, String>();
			}
			try {
				// (3)再次调用接口
				String fianlresultJson = HttpServiceUtil.sendGet(iotServiceUrl + url, charset);
				// (4)获取返回值
				resultMap = JSON.parseObject(fianlresultJson, Map.class);
			} catch (Exception e) {
				logger.error("再次调用北向接口失败: " + e.getMessage());
				return new HashMap<String, String>();
			}
			if (resultMap == null) {
				logger.error("再次调用北向接口返回值为空");
				return new HashMap<String, String>();
			}
		}
		// 5.判断是否调用成功
		if ("0".equals(resultMap.get("resultCode"))) {
		if (NorthboundInterfaceConstant.resultCode_succeed.equals(resultMap.get("resultCode"))) {
			logger.info("调用北向接口成功");
		} else {
			logger.info("调用北向接口失败");
@@ -122,11 +145,18 @@ public class NorthboundInterfaceUtil {
		// 调用北向服务的接口
		logger.debug("POSt调用北向接口");
		boolean loginFlag = true;
		// 1.在缓存中获取sessionId与sign
		Map<String, String> mapCache = getMapCache();
		if (mapCache.isEmpty() || mapCache.get("sign") == null || mapCache.get("session_id") == null) {
			// 2.如果没有调用登录接口从新获取
			iotLogin();
			loginFlag = iotLogin();
		}
		if (!loginFlag) {
			logger.debug("调用北向接口登录失败");
			return new HashMap<String, String>();
		}
		// 3.调用北向服务接口
@@ -136,34 +166,52 @@ public class NorthboundInterfaceUtil {
		Map<String, String> resultMap = null;
		try {
			// (2)调用接口
			String resultJson = HttpServiceUtil.sendPost(iotServiceUrl+url, paramsMap, charset, getMapCache());
			String resultJson = HttpServiceUtil.sendPost(iotServiceUrl + url, paramsMap, charset, getMapCache());
			// (3)将参数转为Map<String,String>【将返回值统一为String】
			resultMap = JSON.parseObject(resultJson, Map.class);
		} catch (Exception e) {
			logger.error("调用北向接口失败: " + e.getMessage());
			return new HashMap<String, String>();
		}
		if (resultMap == null) {
			logger.info("调用北向接口失败");
			logger.error("调用北向接口返回值为空");
			return new HashMap<String, String>();
		}
		// 4.登录超时，需重新登录
		if ("登录超时".equals(resultMap.get("resultMsg"))) {
			logger.info("调用北向接口失败，需重新登录");
			logger.info("调用北向接口登录超时，需重新登录");
			// 4.调用不成功可能是登录过期
			// (1)清除缓存
			clear();
			// (2)重新登录
			iotLogin();
			// (3)再次调用接口
			String fianlresultJson = HttpServiceUtil.sendPost(iotServiceUrl+url, paramsMap, charset, getMapCache());
			// (4)获取返回值
			resultMap = JSON.parseObject(fianlresultJson, Map.class);
			loginFlag = iotLogin();
			if (!loginFlag) {
				logger.debug("再次调用北向接口登录失败");
				return new HashMap<String, String>();
			}
			try {
				// (3)再次调用接口
				String fianlresultJson = HttpServiceUtil.sendPost(iotServiceUrl + url, paramsMap, charset,
						getMapCache());
				// (4)获取返回值
				resultMap = JSON.parseObject(fianlresultJson, Map.class);
			} catch (Exception e) {
				logger.error("再次调用北向接口失败: " + e.getMessage());
				return new HashMap<String, String>();
			}
			if (resultMap == null) {
				logger.error("再次调用北向接口返回值为空");
				return new HashMap<String, String>();
			}
		}
		// 5.判断是否调用成功
		if ("0".equals(resultMap.get("resultCode"))) {
		if (NorthboundInterfaceConstant.resultCode_succeed.equals(resultMap.get("resultCode"))) {
			logger.info("调用北向接口成功");
		} else {
			logger.info("调用北向接口失败");
@@ -177,7 +225,7 @@ public class NorthboundInterfaceUtil {
	 * 
	 * @return
	 */
	private Map<String, String> iotLogin() {
	private boolean iotLogin() {
		logger.debug("登录北向接口");
		// 调用登录接口获取sessionId与sign
@@ -188,30 +236,26 @@ public class NorthboundInterfaceUtil {
		// 设置字符集
		Charset charset = Charset.forName("utf-8");
		Map mapType = null;
		Map loginResultMap = null;
		try {
			// 调用登录接口
			String loginResult = HttpServiceUtil.sendPost(iotLoginUrl, loginParamMap, charset);
			mapType = JSON.parseObject(loginResult, Map.class);
			loginResultMap = JSON.parseObject(loginResult, Map.class);
		} catch (Exception e) {
			logger.error("登录北向接口失败: " + e.getMessage());
			return false;
		}
		if (mapType != null) {
			Map result = (Map) mapType.get("result");
			if ("0".equals(String.valueOf(mapType.get("resultCode")))) {
				logger.info("登录北向接口成功");
				// 将数据存到缓存中
				setMapCache(result);
			} else {
				logger.info("登录北向接口失败");
			}
		if (loginResultMap != null && NorthboundInterfaceConstant.resultCode_succeed
				.equals(String.valueOf(loginResultMap.get("resultCode")))) {
			logger.info("登录北向接口成功");
			Map result = (Map) loginResultMap.get("result");
			// 将数据存到缓存中
			setMapCache(result);
			return true;
		} else {
			logger.info("登录北向接口失败");
			return false;
		}
		return cacheMap;
	}
}

ebc-sea-platform/src/main/resources/dev/application-gis.properties

@@ -8,5 +8,8 @@ url.gis.token=http://192.168.74.189:9999/gisIntf/account/gettoken
#\u6d77\u56fe\u4e2d\u5fc3\u5750\u6807
seaMap.centre.longitude=123.396036
seaMap.centre.latitude=31.560302
#\u6d77\u56fe\u663e\u793a\u6bd4\u4f8b\u5c3a
# 5-->300km,6-->200km,7-->100km,8-->50km,9-->20km,10-->10km,11-->5km
# 12-->2km,13-->1km,14-->500m,15-->300m,16-->200m,17-->100m,18-->50m
seaMap.scale=11

ebc-sea-platform/src/main/resources/dev/application-iot.properties

@@ -3,6 +3,9 @@ aap.iot.userCode=IOT_ADMIN
aap.iot.passWord=123456
#iot\u7684\u5317\u5411\u63a5\u53e3\u6ce8\u518c\u5730\u5740
url.iot.login=http://60.205.219.67:8300/sso/login
#url.iot.login=http://60.205.219.67:8300/sso/login
url.iot.login=http://47.105.130.83:8083/sso/login
#iot\u7684\u5317\u5411\u63a5\u53e3\u7edf\u4e00\u5730\u5740
url.iot.service=http://60.205.219.67:8300/dmp/terminalNorthApi/
#url.iot.service=http://60.205.219.67:8300/dmp/terminalNorthApi/
url.iot.service=http://47.105.130.83:8083/dmp/terminalNorthApi/

ebc-sea-platform/src/main/resources/pro/application-gis.properties

@@ -8,5 +8,8 @@ url.gis.token=http://192.168.74.189:9999/gisIntf/account/gettoken
#\u6d77\u56fe\u4e2d\u5fc3\u5750\u6807
seaMap.centre.longitude=123.396036
seaMap.centre.latitude=31.560302
#\u6d77\u56fe\u663e\u793a\u6bd4\u4f8b\u5c3a
# 5-->300km,6-->200km,7-->100km,8-->50km,9-->20km,10-->10km,11-->5km
# 12-->2km,13-->1km,14-->500m,15-->300m,16-->200m,17-->100m,18-->50m
seaMap.scale=11

ebc-sea-platform/src/main/resources/sql/ipu/RescueDao.xml

@@ -17,14 +17,9 @@
	        AND l.ALARM_TYPE <> #{offlineType}
	        AND l.DATA_STATUS = #{alarmDataStatus}
	        
	        <if test="deviceIdsList != null">
		        AND l.DEVICE_ID IN (
				
	    		<foreach collection="deviceIdsList" item="item" separator=",">
	        		#{item}
	    		</foreach>
	    		
	    		)
	        <if test="deviceId != null">
		        AND ( l.DEVICE_ID = #{deviceId}
		        OR t.DEVICE_ID = #{deviceId} )
    		</if>
    		
	        </where>

ebc-sea-platform/src/main/resources/test/application-gis.properties

@@ -8,5 +8,8 @@ url.gis.token=http://192.168.74.189:9999/gisIntf/account/gettoken
#\u6d77\u56fe\u4e2d\u5fc3\u5750\u6807
seaMap.centre.longitude=123.396036
seaMap.centre.latitude=31.560302
#\u6d77\u56fe\u663e\u793a\u6bd4\u4f8b\u5c3a
# 5-->300km,6-->200km,7-->100km,8-->50km,9-->20km,10-->10km,11-->5km
# 12-->2km,13-->1km,14-->500m,15-->300m,16-->200m,17-->100m,18-->50m
seaMap.scale=11