修改数据订阅

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

@@ -1,8 +1,6 @@
package com.ai.ipu.server.controller;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -17,7 +15,6 @@ import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.ai.ipu.server.service.interfaces.ReceiveSubscribeService;
import com.ai.ipu.server.util.EbcConstant;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
/**
@@ -44,8 +41,8 @@ public class ReceiveSubscribeController {
		logger.info("已接收定位消息，消息为：" + msg);
		// 解析数据
		List<Map> msgList = JSON.parseArray(msg, Map.class);
		for (Map msgMap : msgList) {
		JSONObject msgMap=(JSONObject) JSONObject.parse(msg);
		
			String msgJson = (String) msgMap.get("dataPointValue");
			JSONObject detailInfo = JSONObject.parseObject(msgJson);
			JMap detailInfoMap = new JsonMap();
@@ -63,11 +60,9 @@ public class ReceiveSubscribeController {
			detailInfoMap.put("latitude",
					latitudeBigDecimal.setScale(EbcConstant.coord_scale, BigDecimal.ROUND_HALF_UP).toString());
			// 分析并推送定位数据
			// 解析并推送定位数据
			receiveSubscribeService.receiveIotLocationData(detailInfoMap);
		}
		return msg;
	}
@@ -82,8 +77,8 @@ public class ReceiveSubscribeController {
		logger.info("已接收告警消息，消息为：" + msg);
		// 解析数据
		List<Map> msgList = JSON.parseArray(msg, Map.class);
		for (Map msgMap : msgList) {
		JSONObject msgMap=(JSONObject) JSONObject.parse(msg);
		
			String msgJson = (String) msgMap.get("dataPointValue");
			JSONObject detailInfo = JSONObject.parseObject(msgJson);
			JMap detailInfoMap = new JsonMap();
@@ -101,33 +96,12 @@ public class ReceiveSubscribeController {
			detailInfoMap.put("latitude",
					latitudeBigDecimal.setScale(EbcConstant.coord_scale, BigDecimal.ROUND_HALF_UP).toString());
			// 报警类型
			switch (detailInfo.getJSONObject("alarmType").getIntValue("value")) {
			case EbcConstant.alarm_type_autosos_beidou:
				// 自动报警
				detailInfoMap.put("locationStatus", EbcConstant.location_status_autosos);// 定位状态
				detailInfoMap.put("alarmType", EbcConstant.alarm_type_autosos_ZH);// 报警类型
				break;
			case EbcConstant.alarm_type_jogsos_beidou:
				// 手动报警
				detailInfoMap.put("locationStatus", EbcConstant.location_status_jogsos);// 定位状态
				detailInfoMap.put("alarmType", EbcConstant.alarm_type_jogsos_ZH);// 报警类型
				break;
			case EbcConstant.alarm_type_offline_beidou:
				// 离线
				detailInfoMap.put("locationStatus", EbcConstant.location_status_offline);// 定位状态
				detailInfoMap.put("alarmType", EbcConstant.alarm_type_offline_ZH);// 报警类型
				break;
			default:
				logger.error("告警消息的内容错误，消息为：" + msg);
				return msg;
			}
			//报警类型
			detailInfoMap.put("alarmType",detailInfo.getJSONObject("alarmType").getIntValue("value"));
			
			// 分析并推送报警数据
			receiveSubscribeService.receiveIotAlarmData(detailInfoMap);
		}
		return msg;
	}

ebc-sea-platform/src/main/java/com/ai/ipu/server/service/iotData/ManageIotNewAlarmData.java

@@ -12,6 +12,7 @@ import com.ai.ipu.basic.log.IpuLoggerFactory;
import com.ai.ipu.data.JMap;
import com.ai.ipu.server.dao.interfaces.MapTagManageDao;
import com.ai.ipu.server.dao.interfaces.RescueDao;
import com.ai.ipu.server.util.EbcConstant;
import com.ai.ipu.server.util.JingPingSendDateUtil;
@Component
@@ -37,12 +38,32 @@ public class ManageIotNewAlarmData {
	}
	private void sendJingpingData(JMap params, String logId) {
		// 报警类型
		switch (params.getInt("alarmType")) {
		case EbcConstant.alarm_type_autosos_beidou:
			// 自动报警
			params.put("locationStatus", EbcConstant.location_status_autosos);// 定位状态
			params.put("alarmType", EbcConstant.alarm_type_autosos_ZH);// 报警类型
			break;
		case EbcConstant.alarm_type_jogsos_beidou:
			// 手动报警
			params.put("locationStatus", EbcConstant.location_status_jogsos);// 定位状态
			params.put("alarmType", EbcConstant.alarm_type_jogsos_ZH);// 报警类型
			break;
		case EbcConstant.alarm_type_offline_beidou:
			// 离线
			params.put("locationStatus", EbcConstant.location_status_offline);// 定位状态
			params.put("alarmType", EbcConstant.alarm_type_offline_ZH);// 报警类型
			break;
		default:
			logger.error("告警消息的内容错误");
		}
		params.put("alarmDate", params.getString("newDate"));// 求救时间
		params.put("alarmLong", "0");// 求救时长
		params.put("isNewAlarm", "1");
		params.put("alarmLogId", logId);
		params.put("isNewAlarm", "1");
		JingPingSendDateUtil.sendData(JingPingSendDateUtil.topic_personnel, params);
	}
@@ -67,7 +88,6 @@ public class ManageIotNewAlarmData {
		// 报警位置
		if (currentAreaInfoList == null || currentAreaInfoList.isEmpty()) {
			dataMap.put("callerLocation", "");
		} else {
			StringBuffer mapTagName = new StringBuffer(String.valueOf(currentAreaInfoList.get(0).get("MAP_TAG_NAME")));
			for (int i = 1; i < currentAreaInfoList.size(); i++) {