修改镜屏名称、新增查询历史报警救援等

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

@@ -258,7 +258,7 @@ public class DeviceManageController {
	}
	
	/**
	 * 按时间段获取终端的定位信息
	 * 按时间段获取终端的定位信息(轨迹回放)
	 * 
	 * @param params
	 * @return
@@ -278,7 +278,7 @@ public class DeviceManageController {
		// 当前页码
		int pageNum = params.getInt("pageNum") < 1 ? 1 : params.getInt("pageNum");
		// 每页条数
		int pageSize = params.getInt("pageSize") < 1 ? EbcConstant.default_page_size : params.getInt("pageSize");
		int pageSize = params.getInt("pageSize") < 1 ? EbcConstant.track_playback_size : params.getInt("pageSize");
		result = deviceManageService.queryOneDeviceLocationInfo(params, pageNum, pageSize);
		return result;

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

@@ -1,22 +1,17 @@
package com.ai.ipu.server.controller;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.ai.ipu.server.service.interfaces.ExportService;
import com.ai.ipu.server.service.interfaces.RescueService;
import com.ai.ipu.server.util.EbcConstant;
import com.github.pagehelper.PageInfo;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.ai.ipu.server.service.interfaces.RescueService;
import com.ai.ipu.server.util.EbcConstant;
/**
 * 报警救援
@@ -25,98 +20,144 @@ import org.springframework.web.bind.annotation.ResponseBody;
@RequestMapping("/rescue")
public class RescueController {
    @Autowired
    RescueService rescueService;
    
    /**
	 * 分页查询报警救援日志
	@Autowired
	RescueService rescueService;
	/**
	 * 获取当前终端最新定位信息
	 * 
	 * @param params
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryPageRescueLog")
	public JMap queryPageRescueLog(JMap params) throws Exception {
	@RequestMapping("/queryCurrentRescueLocationInfo")
	public JMap queryCurrentRescueLocationInfo(JMap params) throws Exception {
		JMap result = new JsonMap();
		// 当前页数
		int pageNum = params.getInt("pageNum") < 1 ? 1 : params.getInt("pageNum");
		// 每页条数
		int pageSize = params.getInt("pageSize") < 1 ? EbcConstant.default_page_size : params.getInt("pageSize");
		List<Map<String, String>> resultList = rescueService.queryCurrentRescueLocationInfo(params);
		result.put("dataList", resultList);
		return result;
	}
		JMap result = rescueService.queryPageRescueLog(params, pageNum, pageSize);
	/**
	 * 指派救援
	 * 
	 * @param params
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/assignRescuer")
	public JMap assignRescuer(JMap params) throws Exception {
		JMap result = new JsonMap();
		result.put("pageNum", pageNum);
		result.put("pageSize", pageSize);
		if (params == null || params.get("rescueLogId") == null || params.get("rescuerCode") == null) {
			result.put("result", false);
			result.put("errMsg", "指派失败");
			return result;
		}
		boolean resultMap = rescueService.assignRescuer(params);
		result.put("result", resultMap);
		return result;
	}
	/**
	 * 查询单个报警救援日志
	 * 关闭救援
	 * 
	 * @param params
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryOneRescueLog")
	public JMap queryOneRescueLog(JMap params) throws Exception {
	@RequestMapping("/closeRescue")
	public JMap closeRescue(JMap params) throws Exception {
		JMap result = new JsonMap();
		if (params == null || params.get("rescueLogId") == null) {
			result.put("result", false);
			result.put("errMsg", "操作失败");
			result.put("errMsg", "关闭失败");
			return result;
		}
		Map<String, Object> resultMap = rescueService.queryOneRescueLog(params);
		result.put("resultData", resultMap);
		// TODO 修改人员的状态
		boolean resultMap = rescueService.closeRescue(params);
		result.put("result", resultMap);
		return result;
	}
	/**
	 * 指派救援
	 * 分页查询报警救援日志
	 * 
	 * @param params
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/assignRescuer")
	public JMap assignRescuer(JMap params) throws Exception {
	@RequestMapping("/queryPageRescueLog")
	public JMap queryPageRescueLog(JMap params) throws Exception {
		// 当前页数
		int pageNum = params.getInt("pageNum") < 1 ? 1 : params.getInt("pageNum");
		// 每页条数
		int pageSize = params.getInt("pageSize") < 1 ? EbcConstant.default_page_size : params.getInt("pageSize");
		JMap result = rescueService.queryPageRescueLog(params, pageNum, pageSize);
		result.put("pageNum", pageNum);
		result.put("pageSize", pageSize);
		return result;
	}
	/**
	 * 删除报警救援日志
	 * 
	 * @param params
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/deleteRescueLog")
	public JMap deleteRescueLog(JMap params) throws Exception {
		JMap result = new JsonMap();
		if (params == null || params.get("rescueLogId") == null||params.get("rescuerCode") == null) {
		if (params == null || params.get("alarmLogId") == null) {
			result.put("result", false);
			result.put("errMsg", "指派失败");
			result.put("errMsg", "删除失败");
			return result;
		}
		boolean resultMap = rescueService.assignRescuer(params);
		boolean resultMap = rescueService.deleteRescueLog(params);
		result.put("result", resultMap);
		return result;
	}
	
	/**
	 * 关闭救援
	 *  救援回放
	 * 
	 * @param params
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/closeRescue")
	public JMap closeRescue(JMap params) throws Exception {
	@RequestMapping("/queryOneRescuePlayback")
	public JMap queryOneRescuePlayback(JMap params) throws Exception {
		JMap result = new JsonMap();
		
		if (params == null || params.get("rescueLogId") == null) {
		if (params == null || params.get("alarmLogId") == null) {
			result.put("result", false);
			result.put("errMsg", "关闭失败");
			result.put("errMsg", "回放失败");
			return result;
		}
		
		boolean resultMap = rescueService.closeRescue(params);
		result.put("result", resultMap);
		// 当前页码
		int pageNum = params.getInt("pageNum") < 1 ? 1 : params.getInt("pageNum");
		// 每页条数
		int pageSize = params.getInt("pageSize") < 1 ? EbcConstant.track_playback_size : params.getInt("pageSize");
		result = rescueService.queryOneRescuePlayback(params, pageNum, pageSize);
		return result;
	}

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

@@ -9,6 +9,7 @@ import org.springframework.stereotype.Component;
import com.ai.ipu.common.date.TimeUtil;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.ai.ipu.database.dao.impl.AbstractBizDao;
import com.ai.ipu.server.dao.interfaces.RescueDao;
import com.ai.ipu.server.util.EbcConstant;
@@ -17,40 +18,84 @@ import com.ai.ipu.sql.mgmt.SqlMgmtDaoFactory;
@Component
public class RescueDaoImpl extends AbstractBizDao implements RescueDao {
	
	private String connName = "ebc";
	
	public RescueDaoImpl() throws IOException {
		super("ebc");
	}
	@Override
	public JMap queryPageRescueLog(JMap params, int pageNum, int pageSize) throws Exception {
		// TODO Auto-generated method stub
		return null;
		Map<String, Object> dataMap = new HashMap<String, Object>();
		StringBuilder sql = new StringBuilder();
		sql.append(" SELECT l.LOG_ID,l.CALLER_ID,l.DEVICE_ID CALLER_DEVICE_ID,l.RESCUERS_ID,l.ALARM_TYPE, ");
		sql.append(
				" l.PARTY_CODE CALLER_CODE,l.PARTY_NAME CALLER_NAME,l.LONGITUDE CALLER_LONGITUDE,l.LATITUDE CALLER_LATITUDE, ");
		sql.append(" l.CALLER_DATE,l.LAST_LOCATION_DATE,l.RESCUERS_DATE, ");
		sql.append(" r.PARTY_CODE RESCUER_CODE,r.PARTY_NAME RESCUER_NAME,t.DEVICE_ID RESCUER_DEVICE_ID ");
		sql.append(" FROM LR_RESCUE_LOG l ");
		sql.append(" LEFT JOIN LR_RESCUERS r ON l.RESCUERS_ID=r.RESCUERS_ID ");
		sql.append(" LEFT JOIN LR_PARTY_TERMINAL t ON t.PARTY_TYPE=r.PARTY_TYPE AND t.PARTY_CODE=r.PARTY_CODE ");
		sql.append(" WHERE 1=1 ");
		sql.append(" AND l.DATA_STATUS = '").append(EbcConstant.data_status_close).append("' ");
		
		if (params.get("alarmType") != null) {
			sql.append(" AND ALARM_TYPE = #{alarmType} ");
			dataMap.put("alarmType", params.get("alarmType"));
		}
		if (params.get("callerName") != null) {
			sql.append(" AND l.PARTY_NAME like CONCAT('%', #{callerName}, '%') ");
			dataMap.put("callerName", params.get("callerName"));
		}
		sql.append(" ORDER BY l.CREATE_DATE DESC ");
		// 获取数据列表
		List<Map<String, Object>> data = dao.executeSelect(sql.toString(), dataMap, pageNum, pageSize);
		// 获取总条数
		sql.insert(0, "select count(1) dataNum from ( ");
		sql.append(" ) a ");
		Map map = dao.executeSelectOne(sql.toString(), dataMap);
		JMap result = new JsonMap();
		result.put("dataList", data);
		result.put("dataNum", map.get("dataNum"));
		return result;
	}
	@Override
	public List<Map<String, Object>> queryNoCloseRescueLog(List<String> deviceIdsList) throws Exception {
		Map<String, Object> dataMap=new HashMap<String, Object>();
		dataMap.put("deviceIdsList", deviceIdsList);//设备ID
		dataMap.put("offlineType", EbcConstant.alarm_type_offline_ZH);//不属于离线告警
		dataMap.put("alarmDataStatus", EbcConstant.data_status_valid);//数据状态
		
		Map<String, Object> dataMap = new HashMap<String, Object>();
		dataMap.put("deviceIdsList", deviceIdsList);// 设备ID
		dataMap.put("offlineType", EbcConstant.alarm_type_offline_ZH);// 不属于离线告警
		dataMap.put("alarmDataStatus", EbcConstant.data_status_valid);// 数据状态
		ISqlMgmtDao mgmtDao = SqlMgmtDaoFactory.createFileSqlMgmtDao(connName);
		return mgmtDao.executeSelect("ipu.RescueDao",  "queryNoCloseRescueLog", dataMap);
		return mgmtDao.executeSelect("ipu.RescueDao", "queryNoCloseRescueLog", dataMap);
	}
	@Override
	public Map<String, Object> queryOneRescueLog(JMap params) throws Exception {
		// TODO Auto-generated method stub
		return null;
	public Map<String, Object> queryOneRescueLog(Map<String, Object> dataMap) throws Exception {
		List<Map<String, Object>> list = dao.selectByCond("LR_RESCUE_LOG", dataMap);
		if (list == null) {
			return new HashMap<String, Object>();
		} else {
			return list.get(0);
		}
	}
	@Override
	public String addRescueLog(Map<String, Object> dataMap) throws Exception {
		dataMap.put("dataStatus", EbcConstant.data_status_valid);
		//TODO 创建人和操作人的编号和部门
		// TODO 创建人和操作人的编号和部门
		dataMap.put("remarks", null);
		dataMap.put("createDate", TimeUtil.getSysTime());
		dataMap.put("createOpId", "");
@@ -60,20 +105,26 @@ public class RescueDaoImpl extends AbstractBizDao implements RescueDao {
		dataMap.put("orgId", "");
		ISqlMgmtDao mgmtDao = SqlMgmtDaoFactory.createFileSqlMgmtDao(connName);
		mgmtDao.executeInsert("ipu.RescueDao","addRescueLog", dataMap);
		
		//TODO 返回新增记录的ID
		mgmtDao.executeInsert("ipu.RescueDao", "addRescueLog", dataMap);
		// TODO 返回新增记录的ID
		return String.valueOf(dataMap.get("LOG_ID"));
	}
	
	@Override
	public boolean modifyRescueRecord(Map<String, Object> dataMap) throws Exception {
		//TODO 操作人的编号和部门
		// TODO 操作人的编号和部门
		dataMap.put("DONE_DATE", TimeUtil.getSysTime());
		dataMap.put("OP_ID", "");
		dataMap.put("ORG_ID", "");
		
		return dao.update("LR_RESCUE_LOG", dataMap)>0;
		return dao.update("LR_RESCUE_LOG", dataMap) > 0;
	}
	@Override
	public boolean deleteRescueLog(JMap params) throws Exception {
		Map<String, Object> dataMap = new HashMap<String, Object>();
		dataMap.put("LOG_ID", params.getString("alarmLogId"));
		return dao.delete("LR_RESCUE_LOG", dataMap) > 0;
	}
}

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

@@ -26,12 +26,12 @@ public interface RescueDao {
	List<Map<String, Object>> queryNoCloseRescueLog(List<String> deviceIdsList) throws Exception;
	/**
	 * 根据终端标识获取单个报警救援日志
	 * 查询单个报警救援日志
	 * @param params
	 * @return
	 * @throws Exception
	 */
	Map<String, Object> queryOneRescueLog(JMap params) throws Exception;
	Map<String, Object> queryOneRescueLog(Map<String, Object> dataMap) throws Exception;
	/**
	 * 添加报警救援日志
@@ -49,4 +49,12 @@ public interface RescueDao {
	 */
	boolean modifyRescueRecord(Map<String, Object> dataMap) throws Exception;
	
	/**
	 * 删除报警救援日志
	 * @param params
	 * @return
	 * @throws Exception
	 */
	boolean deleteRescueLog(JMap params) throws Exception;
	
}

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

@@ -208,7 +208,7 @@ public class DeviceManageServiceImpl implements DeviceManageService {
		// 获取终端当前位置信息
		List<Map<String, String>> list = deviceManageDao.queryCurrentDeviceLocationInfo(deviceIdsList);
		// 查询是否为需救援的人员
		// 查询当前所有未关闭的求救信息
		List<Map<String, Object>> alarmMapList = rescueDao.queryNoCloseRescueLog(deviceIdsList);
		// 查询人员所在围栏信息
@@ -254,6 +254,17 @@ public class DeviceManageServiceImpl implements DeviceManageService {
						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:
@@ -312,7 +323,7 @@ public class DeviceManageServiceImpl implements DeviceManageService {
					}
				}
				// 判断是否在违规
				// 判断是否违规
				if (maxMapTagGrade == 5) {
					// 进入电子围栏(禁区)，需显示进入时间
					map.put("inDate", simpleDateFormat.format(areaInfoMap.get("IN_DATE"))); // 进入时间

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

@@ -15,11 +15,11 @@ import com.ai.ipu.database.conn.SqlSessionManager;
import com.ai.ipu.server.dao.interfaces.DeviceManageDao;
import com.ai.ipu.server.dao.interfaces.MapTagManageDao;
import com.ai.ipu.server.service.interfaces.ReceiveSubscribeService;
import com.ai.ipu.server.service.iotData.ManageIotInAreaData;
import com.ai.ipu.server.service.iotData.ManageIotNewAlarmData;
import com.ai.ipu.server.service.iotData.ManageIotNoCloseAlarmData;
import com.ai.ipu.server.service.iotData.ManageIotNoInAreaData;
import com.ai.ipu.server.service.iotData.ManageIotToolData;
import com.ai.ipu.server.service.iotdata.ManageIotInAreaData;
import com.ai.ipu.server.service.iotdata.ManageIotNewAlarmData;
import com.ai.ipu.server.service.iotdata.ManageIotNoCloseAlarmData;
import com.ai.ipu.server.service.iotdata.ManageIotNoInAreaData;
import com.ai.ipu.server.service.iotdata.ManageIotToolData;
@Service
public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {

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

@@ -1,12 +1,14 @@
package com.ai.ipu.server.service.impl;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ai.ipu.data.JMap;
import com.ai.ipu.server.dao.interfaces.DeviceManageDao;
import com.ai.ipu.server.dao.interfaces.RescueDao;
import com.ai.ipu.server.service.interfaces.RescueService;
import com.ai.ipu.server.util.EbcConstant;
@@ -16,16 +18,9 @@ public class RescueServiceImpl implements RescueService {
	@Autowired
	RescueDao rescueDao;
	@Override
	public JMap queryPageRescueLog(JMap params, int pageNum, int pageSize) throws Exception {
		return rescueDao.queryPageRescueLog(params, pageNum, pageSize);
	}
	@Override
	public Map<String, Object> queryOneRescueLog(JMap params) throws Exception {
		return rescueDao.queryOneRescueLog(params);
	}
	
	@Autowired
	DeviceManageDao deviceManageDao;
	@Override
	public boolean assignRescuer(JMap params) throws Exception {
@@ -45,4 +40,37 @@ public class RescueServiceImpl implements RescueService {
		return rescueDao.modifyRescueRecord(dataMap);
	}
	@Override
	public JMap queryPageRescueLog(JMap params, int pageNum, int pageSize) throws Exception {
		//TODO 计算求救时间、按时间查询
		
		
		return rescueDao.queryPageRescueLog(params, pageNum, pageSize);
	}
	@Override
	public boolean deleteRescueLog(JMap params) throws Exception {
		return rescueDao.deleteRescueLog(params);
	}
	@Override
	public List<Map<String, String>> queryCurrentRescueLocationInfo(JMap params) {
		//TODO
		
		
		
		return null;
	}
	
	@Override
	public JMap queryOneRescuePlayback(JMap params, int pageNum, int pageSize) {
		//TODO
		
		
		
		
		return null;
	}
}

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

@@ -82,7 +82,7 @@ public interface DeviceManageService {
	/**
	 * 获取终端的最新事件
	 * @param deviceIds
	 * @param params
	 * @return
	 * @throws Exception
	 */

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

@@ -1,5 +1,6 @@
package com.ai.ipu.server.service.interfaces;
import java.util.List;
import java.util.Map;
import com.ai.ipu.data.JMap;
@@ -7,6 +8,20 @@ import com.ai.ipu.data.JMap;
public interface RescueService {
	/**
	 * 指派救援
	 * @return
	 * @throws Exception
	 */
	boolean assignRescuer(JMap params) throws Exception;
	/**
	 * 关闭救援
	 * @return
	 * @throws Exception
	 */
	boolean closeRescue(JMap params) throws Exception;
	/**
	 * 分页查询报警救援日志
	 * @param params
	 * @param pageNum 当前页数
@@ -17,25 +32,26 @@ public interface RescueService {
	JMap queryPageRescueLog(JMap params, int pageNum, int pageSize) throws Exception;
	/**
	 * 获取单个报警救援日志
	 * 删除报警救援日志
	 * @param params
	 * @return
	 * @throws Exception
	 */
	Map<String, Object> queryOneRescueLog(JMap params) throws Exception;
	boolean deleteRescueLog(JMap params) throws Exception;
	/**
	 * 指派救援
	 * 获取当前终端最新定位信息
	 * @param params
	 * @return
	 * @throws Exception
	 */
	boolean assignRescuer(JMap params) throws Exception;
	List<Map<String, String>> queryCurrentRescueLocationInfo(JMap params);
	
	/**
	 * 关闭救援
	 * 救援回放
	 * @param params
	 * @param pageNum
	 * @param pageSize
	 * @return
	 * @throws Exception
	 */
	boolean closeRescue(JMap params) throws Exception;
	JMap queryOneRescuePlayback(JMap params, int pageNum, int pageSize);
}

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

@@ -1,4 +1,4 @@
package com.ai.ipu.server.service.iotData;
package com.ai.ipu.server.service.iotdata;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -17,7 +17,7 @@ import com.ai.ipu.data.JMap;
import com.ai.ipu.server.dao.interfaces.AreaInOutRecordDao;
import com.ai.ipu.server.util.DateUtil;
import com.ai.ipu.server.util.EbcConstant;
import com.ai.ipu.server.util.JingPingSendDateUtil;
import com.ai.ipu.server.util.MirrorSendDateUtil;
@Component
public class ManageIotInAreaData {
@@ -71,7 +71,7 @@ public class ManageIotInAreaData {
		}
		// 推送镜屏
		sendJingpingData(params, currentAreaInfoList);
		sendMirrorData(params, currentAreaInfoList);
		// 保存进出围栏记录
		saveOutAreaRecord(params, beforeAreaMapList);
@@ -80,7 +80,7 @@ public class ManageIotInAreaData {
		return true;
	}
	private void sendJingpingData(JMap params, List<Map<String, Object>> currentAreaInfoList) throws ParseException {
	private void sendMirrorData(JMap params, List<Map<String, Object>> currentAreaInfoList) throws ParseException {
		int maxMapTagGrade = 0; // 围栏优先级(电子围栏5>定点3>考勤1、作业1)
		long minInAreaLong = System.currentTimeMillis();// 进入围栏最早的时间戳
@@ -152,7 +152,7 @@ public class ManageIotInAreaData {
		}
		// 推送镜屏
		JingPingSendDateUtil.sendData(JingPingSendDateUtil.topic_personnel, params);
		MirrorSendDateUtil.sendData(MirrorSendDateUtil.topic_personnel, params);
	}
	private boolean saveOutAreaRecord(JMap params, List<Map<String, Object>> outAreaList) throws Exception {

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

@@ -1,4 +1,4 @@
package com.ai.ipu.server.service.iotData;
package com.ai.ipu.server.service.iotdata;
import java.util.HashMap;
import java.util.List;
@@ -13,7 +13,7 @@ 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;
import com.ai.ipu.server.util.MirrorSendDateUtil;
@Component
public class ManageIotNewAlarmData {
@@ -32,12 +32,12 @@ public class ManageIotNewAlarmData {
		String logId = saveAlarmData(params, bindInfoMap);
		// 推送镜屏
		sendJingpingData(params, logId);
		sendMirrorData(params, logId);
		return true;
	}
	private void sendJingpingData(JMap params, String logId) {
	private void sendMirrorData(JMap params, String logId) {
		// 报警类型
		switch (params.getInt("alarmType")) {
		case EbcConstant.alarm_type_autosos_beidou:
@@ -62,10 +62,13 @@ public class ManageIotNewAlarmData {
		params.put("alarmDate", params.getString("newDate"));// 求救时间
		params.put("alarmLong", "0");// 求救时长
		// 未指派救援人员
		params.put("isNewAlarm", EbcConstant.alarm_status_new);
		// 求救记录ID
		params.put("alarmLogId", logId);
		params.put("isNewAlarm", "1");
		JingPingSendDateUtil.sendData(JingPingSendDateUtil.topic_personnel, params);
		MirrorSendDateUtil.sendData(MirrorSendDateUtil.topic_personnel, params);
	}
	private String saveAlarmData(JMap params, Map<String, Object> deviceAndUser) throws Exception {

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

@@ -1,4 +1,4 @@
package com.ai.ipu.server.service.iotData;
package com.ai.ipu.server.service.iotdata;
import java.text.ParseException;
import java.util.ArrayList;
@@ -15,7 +15,7 @@ import com.ai.ipu.data.JMap;
import com.ai.ipu.server.dao.interfaces.RescueDao;
import com.ai.ipu.server.util.DateUtil;
import com.ai.ipu.server.util.EbcConstant;
import com.ai.ipu.server.util.JingPingSendDateUtil;
import com.ai.ipu.server.util.MirrorSendDateUtil;
@Component
public class ManageIotNoCloseAlarmData {
@@ -37,7 +37,7 @@ public class ManageIotNoCloseAlarmData {
		logger.info("定位信息为已报警人员: " + params.get("userName"));
		// 推送镜屏
		sendJingpingData(params, alarmList.get(0));
		sendMirrorData(params, alarmList.get(0));
		// 修改最后定位时间
		updateLastLocationRecord(params, alarmList.get(0));
@@ -45,7 +45,7 @@ public class ManageIotNoCloseAlarmData {
		return true;
	}
	private void sendJingpingData(JMap params, Map<String, Object> alarmMap) throws ParseException {
	private void sendMirrorData(JMap params, Map<String, Object> alarmMap) throws ParseException {
		// 求救时间
		String alarmDate = String.valueOf(alarmMap.get("CALLER_DATE"));
		params.put("alarmDate", DateUtil.formatStrDate(alarmDate));
@@ -62,10 +62,18 @@ public class ManageIotNoCloseAlarmData {
			params.put("locationStatus", EbcConstant.location_status_autosos);// 报警类型
		}
		params.put("isNewAlarm", "0");
		params.put("logId", alarmMap.get("LOG_ID"));
		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"));
		JingPingSendDateUtil.sendData(JingPingSendDateUtil.topic_personnel, params);
		MirrorSendDateUtil.sendData(MirrorSendDateUtil.topic_personnel, params);
	}
	private boolean updateLastLocationRecord(JMap params, Map<String, Object> alarmMap) throws Exception {

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

@@ -1,4 +1,4 @@
package com.ai.ipu.server.service.iotData;
package com.ai.ipu.server.service.iotdata;
import java.util.ArrayList;
import java.util.List;
@@ -12,7 +12,7 @@ import com.ai.ipu.basic.log.IpuLoggerFactory;
import com.ai.ipu.data.JMap;
import com.ai.ipu.server.dao.interfaces.AreaInOutRecordDao;
import com.ai.ipu.server.util.EbcConstant;
import com.ai.ipu.server.util.JingPingSendDateUtil;
import com.ai.ipu.server.util.MirrorSendDateUtil;
@Component
public class ManageIotNoInAreaData {
@@ -23,7 +23,7 @@ public class ManageIotNoInAreaData {
	public boolean executeReceiveIotData(JMap params) throws Exception {
		// 推送镜屏数据
		sendJingpingData(params);
		sendMirrorData(params);
		// 查询人员之前所在围栏信息
		List<Map<String, Object>> beforeAreaMapList = areaInOutRecordDao
@@ -42,10 +42,10 @@ public class ManageIotNoInAreaData {
		return true;
	}
	private void sendJingpingData(JMap params) {
	private void sendMirrorData(JMap params) {
		params.put("locationStatus", EbcConstant.location_status_normal);// 定位状态
		JingPingSendDateUtil.sendData(JingPingSendDateUtil.topic_personnel, params);
		MirrorSendDateUtil.sendData(MirrorSendDateUtil.topic_personnel, params);
	}
	private boolean updateOutAreaRecord(JMap params, List<Map<String, Object>> beforeAreaMapList) throws Exception {

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

@@ -1,4 +1,4 @@
package com.ai.ipu.server.service.iotData;
package com.ai.ipu.server.service.iotdata;
import java.util.Map;
@@ -9,7 +9,7 @@ import com.ai.ipu.basic.log.ILogger;
import com.ai.ipu.basic.log.IpuLoggerFactory;
import com.ai.ipu.data.JMap;
import com.ai.ipu.server.dao.interfaces.DeviceManageDao;
import com.ai.ipu.server.util.JingPingSendDateUtil;
import com.ai.ipu.server.util.MirrorSendDateUtil;
@Component
public class ManageIotToolData {
@@ -30,16 +30,16 @@ public class ManageIotToolData {
		logger.info("定位信息的对象为船舶: " + bindInfoMap.get("NAME"));
		// 推送镜屏
		sendJingpingData(params, bindInfoMap);
		sendMirrorData(params, bindInfoMap);
		return true;
	}
	private void sendJingpingData(JMap params, Map<String, Object> bindInfoMap) {
	private void sendMirrorData(JMap params, Map<String, Object> bindInfoMap) {
		params.put("shipName", bindInfoMap.get("NAME"));
		params.put("shipCode", bindInfoMap.get("CODE"));
		JingPingSendDateUtil.sendData(JingPingSendDateUtil.topic_ship, params);
		MirrorSendDateUtil.sendData(MirrorSendDateUtil.topic_ship, params);
	}
}

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

@@ -11,6 +11,9 @@ public class EbcConstant {
	// 每页默认查询条数
	public static final int default_page_size = 20;
	
	// 轨迹回放单次查询条数
	public static final int track_playback_size = 100;
	// 经纬度的精度
	public static final int coord_scale = 7;
@@ -87,6 +90,15 @@ public class EbcConstant {
	// 告警类型：离线
	public static final String alarm_type_offline_ZH = "离线告警";
	//报警状态:新报警，未指派
	public static final String alarm_status_new = "1";
	
	//报警状态:未指派
	public static final String alarm_status_needassign = "1";
	
	//报警状态:已指派，未关闭
	public static final String alarm_status_needclose = "2";
	
	// 数据状态：有效(未关闭)
	public static final String data_status_valid = "1";

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

@@ -7,7 +7,7 @@ import com.ai.ipu.server.connect.ps.EventChannelTool;
import com.ai.ipu.server.connect.ps.EventChannelTool.PublisherEvent;
import com.ai.ipu.server.connect.ps.ISubscriber;
import com.ai.ipu.server.connect.ps.impl.Publisher;
import com.ai.ipu.server.service.iotData.ManageIotNoInAreaData;
import com.ai.ipu.server.service.iotdata.ManageIotNoInAreaData;
import com.alibaba.fastjson.JSON;
/**
@@ -15,7 +15,7 @@ import com.alibaba.fastjson.JSON;
 * @author konghl@asiainfo.com
 * 2020-10-21
 */
public class JingPingSendDateUtil {
public class MirrorSendDateUtil {
	private static final ILogger logger = IpuLoggerFactory.createLogger(ManageIotNoInAreaData.class);
	// 人员定位topic

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

@@ -4,9 +4,14 @@
	<sql name="queryNoCloseRescueLog">
		<![CDATA[
		<select id="queryNoCloseRescueLog" resultType="java.util.Map" >
	        SELECT l.LOG_ID,l.CALLER_ID,l.DEVICE_ID,l.PARTY_TYPE,l.PARTY_CODE,
	        l.PARTY_NAME,l.ALARM_TYPE,l.CALLER_DATE,l.RESCUERS_DATE,l.REMARKS
	        SELECT l.LOG_ID,l.CALLER_ID,l.DEVICE_ID,l.RESCUERS_ID,l.PARTY_TYPE,l.PARTY_CODE,
	        l.PARTY_NAME,l.ALARM_TYPE,l.CALLER_DATE,l.RESCUERS_DATE,l.REMARKS,
	        r.PARTY_CODE RESCUER_CODE,r.PARTY_NAME RESCUER_NAME,t.DEVICE_ID RESCUER_DEVICE_ID
	        
	        FROM LR_RESCUE_LOG l
	        LEFT JOIN LR_RESCUERS r ON l.RESCUERS_ID=r.RESCUERS_ID
	        LEFT JOIN LR_PARTY_TERMINAL t ON t.PARTY_TYPE=r.PARTY_TYPE AND t.PARTY_CODE=r.PARTY_CODE
	        
	        <where>
	        l.RESCUERS_DATE IS NULL
	        AND l.ALARM_TYPE <> #{offlineType}