修改url路径的位置和名称

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

@@ -1,6 +1,6 @@
package com.ai.ipu.server.enums;
import com.ai.ipu.server.model.UrlAddress;
import com.ai.ipu.server.util.UrlAddressUtil;
/**
 * iot 北向接口业务数据的地址枚举
@@ -27,7 +27,7 @@ public enum IotUrlEnums {
	}
	public String getUrl() {
		return UrlAddress.IOT_URL1 + "/" + url;
		return UrlAddressUtil.IOT_URL1 + "/" + url;
	}
}

ebc-sea-platform/src/main/java/com/ai/ipu/server/model/UrlAddress.java

@@ -1,13 +0,0 @@
package com.ai.ipu.server.model;
public interface UrlAddress {
	// gis的token地址
	public static final String GIS_TOKEN = "http://192.168.74.189:9999/gisIntf/account/gettoken";
	// iot的北向接口注册地址
	public static final String IOT_LOGIN = "http://60.205.219.67:8300/sso/login";
	// iot的北向接口统一地址
	public static final String IOT_URL1 = "http://60.205.219.67:8300/dmp/terminalNorthApi";
}

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

@@ -9,9 +9,9 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import com.ai.ipu.server.model.UrlAddress;
import com.ai.ipu.server.service.interfaces.GisTokenService;
import com.ai.ipu.server.util.HttpServiceUtil;
import com.ai.ipu.server.util.UrlAddressUtil;
import com.alibaba.fastjson.JSON;
@Service
@@ -31,7 +31,7 @@ public class GisTokenServiceImpl implements GisTokenService {
		mapParams.put("passwd", gisPasswd);
		Charset charset = Charset.forName("utf-8");
		String resultJson = HttpServiceUtil.sendPost(UrlAddress.GIS_TOKEN, mapParams, charset);
		String resultJson = HttpServiceUtil.sendPost(UrlAddressUtil.GIS_TOKEN, mapParams, charset);
		Map<String, Object> resultMap = JSON.parseObject(resultJson, Map.class);
		return resultMap;

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

@@ -1,6 +1,5 @@
package com.ai.ipu.server.service.impl;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -300,6 +299,7 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
			}
		}
		//判断是否在违规(增加字段)
		if (maxMapTagGrade == 5) {
			logger.info("镜屏推送进入电子围栏的信息");
			// 进入电子围栏(禁区)，需显示进入时间
@@ -313,12 +313,11 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
			if (fixedLong > 0) {
				// 围栏要求定点时间
				int residenceTimeLength = Integer
						.getInteger(String.valueOf(sendDataAreaInfo.get("RESIDENCE_TIME_LENGTH")));
				int residenceTimeLength = Integer.parseInt(String.valueOf(sendDataAreaInfo.get("RESIDENCE_TIME_LENGTH")));
				if (residenceTimeLength <= fixedLong) {
					// 已超时
					logger.info("镜屏推送进入定点(限时)的信息");
					logger.info("镜屏推送进入定点(限时)的信息:已超时");
					params.put("locationStatus", EbcConstant.location_status_overtime);
				}
			}
@@ -349,17 +348,21 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
		if (alarmMap == null || alarmMap.isEmpty()) {
			logger.debug("新增报警信息");
			params.put("isNewAlarm", "1");
			params.put("alarmDate", params.getString("newDate"));//求救时间
			params.put("alarmLong", "0");//求救时长
			// 推送镜屏
			String jingpingData = JSON.toJSONString(params);
			logger.debug("推送镜屏数据：" + jingpingData);
			JingPingSendDateUtil.sendData(JingPingSendDateUtil.topic_personnel, jingpingData);
			
			// 保存报警数据
			saveAlarmData(params, deviceAndUser);
		} else {
			params.put("isNewAlarm", "0");
			logger.debug("报警信息未处理");
			beforeAlarmLocationData(params, alarmMap);
		}
		// 4、推送镜屏
		String jingpingData = JSON.toJSONString(params);
		logger.debug("推送镜屏数据：" + jingpingData);
		JingPingSendDateUtil.sendData(JingPingSendDateUtil.topic_personnel, jingpingData);
	}
	/**

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

@@ -54,7 +54,7 @@ public class JingPingSendDateUtil {
		if (alarmLong>0) {
			BigDecimal alarmLongBigDecimal = new BigDecimal(alarmLong);
			// 单位为分，四舍五入不保留小数
			alarmLongBigDecimal = alarmLongBigDecimal.divide(new BigDecimal("60000L"), 0, BigDecimal.ROUND_HALF_UP);
			alarmLongBigDecimal = alarmLongBigDecimal.divide(new BigDecimal("60000"), 0, BigDecimal.ROUND_HALF_UP);
			return alarmLongBigDecimal.intValue();
		}else {
			return 0;

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

@@ -12,7 +12,6 @@ import org.springframework.stereotype.Component;
import com.ai.ipu.basic.log.ILogger;
import com.ai.ipu.basic.log.IpuLoggerFactory;
import com.ai.ipu.server.model.UrlAddress;
import com.alibaba.fastjson.JSON;
/**
@@ -137,10 +136,21 @@ public class NorthboundInterfaceUtil {
		// 3.调用北向服务接口
		// (1)设置字符集
		Charset charset = Charset.forName("utf-8");
		// (2)调用接口
		String resultJson = HttpServiceUtil.sendPost(url, params, charset, getMapCache());
		// (3)将参数转为Map<String,String>【将返回值统一为String】
		Map<String, String> resultMap = JSON.parseObject(resultJson, Map.class);
		// 返回值
		Map<String, String> resultMap = null;
		try {
			// (2)调用接口
			String resultJson = HttpServiceUtil.sendPost(url, params, charset, getMapCache());
			// (3)将参数转为Map<String,String>【将返回值统一为String】
			resultMap = JSON.parseObject(resultJson, Map.class);
		} catch (Exception e) {
			logger.error("调用北向接口失败: " + e.getMessage());
		}
		if (resultMap == null) {
			logger.info("调用北向接口失败");
			return new HashMap<String, String>();
		}
		// 4.登录超时，需重新登录
		if ("登录超时".equals(resultMap.get("resultMsg"))) {
@@ -182,19 +192,29 @@ public class NorthboundInterfaceUtil {
		// 设置字符集
		Charset charset = Charset.forName("utf-8");
		// 调用登录接口
		String loginResult = HttpServiceUtil.sendPost(UrlAddress.IOT_LOGIN, loginParamMap, charset);
		Map mapType = null;
		try {
			// 调用登录接口
			String loginResult = HttpServiceUtil.sendPost(UrlAddressUtil.IOT_LOGIN, loginParamMap, charset);
			mapType = JSON.parseObject(loginResult, Map.class);
		} catch (Exception e) {
			logger.error("登录北向接口失败: " + e.getMessage());
		}
		Map mapType = JSON.parseObject(loginResult, Map.class);
		Map result = (Map) mapType.get("result");
		if (mapType != null) {
			Map result = (Map) mapType.get("result");
		if ("0".equals(String.valueOf(mapType.get("resultCode")))) {
			logger.info("登录北向接口成功");
			// 将数据存到缓存中
			NorthboundInterfaceUtil.setMapCache(result);
			if ("0".equals(String.valueOf(mapType.get("resultCode")))) {
				logger.info("登录北向接口成功");
				// 将数据存到缓存中
				NorthboundInterfaceUtil.setMapCache(result);
			} else {
				logger.info("登录北向接口失败");
			}
		} else {
			logger.info("登录北向接口失败");
		}
		return cacheMap;
	}

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

@@ -0,0 +1,13 @@
package com.ai.ipu.server.util;
public interface UrlAddressUtil {
	// gis的token地址
	public static final String GIS_TOKEN = "http://192.168.74.189:9999/gisIntf/account/gettoken";
	// iot的北向接口注册地址
	public static final String IOT_LOGIN = "http://60.205.219.67:80/sso/login";
	// iot的北向接口统一地址
	public static final String IOT_URL1 = "http://60.205.219.67:80/dmp/terminalNorthApi";
}