增加时间的工具类

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

@@ -235,8 +235,6 @@ public class DeviceManageDaoImpl extends AbstractBizDao implements DeviceManageD
			// 报警类型
			if (detailInfo.getJSONObject("alarmType")!=null) {
				detailInfoMap.put("alarmType", detailInfo.getJSONObject("alarmType").getString("value"));
			}else {
				detailInfoMap.put("alarmType", null);
			}
			
			list.add(detailInfoMap);

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

@@ -52,21 +52,32 @@ public class RescueDaoImpl extends AbstractBizDao implements RescueDao {
	 */
	@Override
	public boolean addRescueLog(Map<String, Object> dataMap) throws Exception {
		dataMap.put("dataStatus", "1");
		dataMap.put("DATA_STATUS", "1");
		//TODO 创建人和操作人的编号和部门
		dataMap.put("departmentId", 1);
		dataMap.put("createDate", TimeUtil.getSysTime());
		dataMap.put("createOpId", "");
		dataMap.put("createOrgId", "");
		dataMap.put("doneDate", TimeUtil.getSysTime());
		dataMap.put("opId", "");
		dataMap.put("orgId", "");
		dataMap.put("CREATE_DATE", TimeUtil.getSysTime());
		dataMap.put("CREATE_OP_ID", "");
		dataMap.put("CREATE_ORG_ID", "");
		dataMap.put("DONE_DATE", TimeUtil.getSysTime());
		dataMap.put("OP_ID", "");
		dataMap.put("ORG_ID", "");
		int num=dao.insert("LR_RESCUE_LOG", dataMap);
		
		return num > 0;
	}
	
	@Override
	public boolean modifyRescueLog(Map<String, Object> dataMap) throws Exception {
		//TODO 操作人的编号和部门
		dataMap.put("DONE_DATE", TimeUtil.getSysTime());
		dataMap.put("OP_ID", "");
		dataMap.put("ORG_ID", "");
		
		int num=dao.update("LR_RESCUE_LOG", dataMap);
		
		return num > 0;
	}
	
	@Override
	public boolean assignRescuer(JMap params) throws Exception {
		// TODO Auto-generated method stub
@@ -78,5 +89,7 @@ public class RescueDaoImpl extends AbstractBizDao implements RescueDao {
		// TODO Auto-generated method stub
		return false;
	}
	
	
}

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

@@ -42,6 +42,14 @@ public interface RescueDao {
	boolean addRescueLog(Map<String, Object> dataMap) throws Exception;
	/**
	 * 修改报警救援日志
	 * @param dataMap
	 * @return
	 * @throws Exception
	 */
	boolean modifyRescueLog(Map<String, Object> dataMap) throws Exception;
	
	/**
	 * 指派救援
	 * @return
	 * @throws Exception

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

@@ -18,6 +18,7 @@ import com.ai.ipu.server.dao.interfaces.DeviceManageDao;
import com.ai.ipu.server.dao.interfaces.RescueDao;
import com.ai.ipu.server.enums.UserEnums;
import com.ai.ipu.server.service.interfaces.DeviceManageService;
import com.ai.ipu.server.util.DateUtil;
import com.ai.ipu.server.util.EbcConstant;
import com.ai.ipu.server.util.JingPingSendDateUtil;
import com.alibaba.fastjson.JSON;
@@ -235,6 +236,7 @@ public class DeviceManageServiceImpl implements DeviceManageService {
			//离线信息
			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;
			}
			
@@ -245,10 +247,10 @@ public class DeviceManageServiceImpl implements DeviceManageService {
					if (deviceId.equals(String.valueOf(alarmMap.get("DEVICE_ID")))) {
						// 求救时间
						String alarmDate = String.valueOf(alarmMap.get("CALLER_DATE"));
						map.put("alarmDate", alarmDate);
						map.put("alarmDate", DateUtil.formatStrDate(alarmDate));
						// 计算求救时长
						int alarmLong = JingPingSendDateUtil.getBetweenMinuteValue(alarmDate, map.get("newDate"));
						int alarmLong = DateUtil.getDifferenceMinute(alarmDate, map.get("newDate"));
						map.put("alarmLong", String.valueOf(alarmLong));
						
						//定位状态
@@ -256,10 +258,12 @@ public class DeviceManageServiceImpl implements DeviceManageService {
						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;
@@ -315,8 +319,7 @@ public class DeviceManageServiceImpl implements DeviceManageService {
				} else if (maxMapTagGrade == 3) {
					// 进入定点(限时)，需计算是否超时
					int fixedLong = JingPingSendDateUtil
							.getBetweenMinuteValue(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) {
						// 围栏要求定点时间

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

@@ -22,6 +22,7 @@ import com.ai.ipu.server.dao.interfaces.DeviceManageDao;
import com.ai.ipu.server.dao.interfaces.MapTagManageDao;
import com.ai.ipu.server.dao.interfaces.RescueDao;
import com.ai.ipu.server.service.interfaces.ReceiveSubscribeService;
import com.ai.ipu.server.util.DateUtil;
import com.ai.ipu.server.util.EbcConstant;
import com.ai.ipu.server.util.JingPingSendDateUtil;
import com.alibaba.fastjson.JSON;
@@ -51,7 +52,7 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
			public void run() {
				try {
					logger.debug("启动定位信息新线程：" + Thread.currentThread().getName());
					//处理定位数据
					// 处理定位数据
					executeReceiveIotLocationData(dataMap);
					logger.debug("数据库连接全量提交");
@@ -76,7 +77,7 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
			public void run() {
				try {
					logger.debug("启动报警信息新线程：" + Thread.currentThread().getName());
					//处理报警数据
					// 处理报警数据
					executeReceiveIotAlarmData(dataMap);
					logger.debug("数据库连接全量提交");
@@ -105,7 +106,7 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
		Map<String, Object> bindInfoMap = deviceManageDao.queryOneBindUser(params.getString("deviceId"), null);
		if (bindInfoMap != null) {
			//设备与人员绑定
			// 设备与人员绑定
			logger.debug("定位信息的对象为人员: " + bindInfoMap.get("NAME"));
			params.put("userName", bindInfoMap.get("NAME"));
			params.put("userCode", bindInfoMap.get("CODE"));
@@ -113,7 +114,7 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
		} else {
			bindInfoMap = deviceManageDao.queryOneBindShip(params.getString("deviceId"), null);
			if (bindInfoMap != null) {
				//设备与船舶绑定
				// 设备与船舶绑定
				logger.info("定位信息的对象为船舶: " + bindInfoMap.get("NAME"));
				params.put("shipName", bindInfoMap.get("NAME"));
				params.put("shipCode", bindInfoMap.get("CODE"));
@@ -123,7 +124,7 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
				logger.debug("推送镜屏数据：" + jingpingData);
				JingPingSendDateUtil.sendData(JingPingSendDateUtil.topic_ship, jingpingData);
			} else {
				//设备未绑定
				// 设备未绑定
				logger.error("定位设备未绑定");
			}
			return;
@@ -173,10 +174,10 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
		// 求救时间
		String alarmDate = String.valueOf(alarmList.get(0).get("CALLER_DATE"));
		params.put("alarmDate", alarmDate);
		params.put("alarmDate", DateUtil.formatStrDate(alarmDate));
		// 计算求救时长
		params.put("alarmLong", JingPingSendDateUtil.getBetweenMinuteValue(alarmDate, params.getString("newDate")));
		params.put("alarmLong", DateUtil.getDifferenceMinute(alarmDate, params.getString("newDate")));
		params.put("isNewAlarm", "0");
@@ -185,6 +186,12 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
		logger.debug("推送镜屏数据：" + jingpingData);
		JingPingSendDateUtil.sendData(JingPingSendDateUtil.topic_personnel, jingpingData);
		// 修改最后定位时间
		Map<String, Object> dataMap = new HashMap<String, Object>();
		dataMap.put("LOG_ID", alarmList.get(0).get("LOG_ID")); // 日志ID
		dataMap.put("LAST_LOCATION_DATE", params.get("newDate")); // 最后定位时间
		rescueDao.modifyRescueLog(dataMap);
		return true;
	}
@@ -343,7 +350,7 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
		} else if (maxMapTagGrade == 3) {
			// 进入定点(限时)，需计算是否超时
			int fixedLong = JingPingSendDateUtil.getBetweenMinuteValue(
			int fixedLong = DateUtil.getDifferenceMinute(
					String.valueOf(sendDataAreaInfo.get("inAreaDate")), params.getString("newDate"));
			if (fixedLong > 0) {
@@ -422,7 +429,8 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
		dataMap.put("ALARM_TYPE", params.get("alarmType")); // 告警类型
		dataMap.put("LONGITUDE", params.get("longitude")); // 报警经度
		dataMap.put("LATITUDE", params.get("latitude")); // 报警纬度
		dataMap.put("CALLER_DATE", params.get("msgDate")); // 报警时间
		dataMap.put("CALLER_DATE", params.get("newDate")); // 报警时间
		dataMap.put("LAST_LOCATION_DATE", params.get("newDate")); // 最后定位时间
		// 报警位置
		if (currentAreaInfoJMap.getInt("mapTagNum") > 0) {

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

@@ -0,0 +1,193 @@
package com.ai.ipu.server.util;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import com.ai.ipu.common.date.TimeUtil;
/**
 * 时间工具类
 * @author konghl@asiainfo.com
 * 2020-11-2
 */
public class DateUtil {
	/**
	 * 比较日期大小
	 * @param dateStr0
	 * @param dateStr1
	 * @return
	 */
	public static int compareDate(String dateStr0, String dateStr1) {
		Date date1 = convertDate(dateStr0);
		Date date2 = convertDate(dateStr1);
		int result = date1.compareTo(date2);
		return result;
	}
	/**
	 * 格式化字符串时间
	 * @param date
	 * @return yyyy-MM-dd HH:mm:ss
	 */
	public static String formatStrDate(String dateStr) {
		Date date = convertDate(dateStr);
		return formatDate(date, "yyyy-MM-dd HH:mm:ss");
	}
	/**
	 * 时间转字符串 
	 * @param date
	 * @return yyyy-MM-dd HH:mm:ss
	 */
	public static String formatDate(Date date) {
		return formatDate(date, "yyyy-MM-dd HH:mm:ss");
	}
	/**
	 * 时间转字符串
	 * @param date
	 * @param pattern 时间格式
	 * @return
	 */
	public static String formatDate(Date date, String pattern) {
		if (date == null) {
			return "";
		}
		SimpleDateFormat formatter = new SimpleDateFormat(pattern);
		return formatter.format(date);
	}
	/**
	 * 字符串转时间
	 * @param dateStr
	 * @return
	 */
	public static Date convertDate(String dateStr) {
		if (dateStr == null || "".equals(dateStr)) {
			return null;
		}
		String pattern = TimeUtil.getTimestampFormat(dateStr);
		return convertDate(dateStr, pattern);
	}
	/**
	 * 字符串转时间
	 * @param dateStr
	 * @param pattern
	 * @return
	 */
	public static Date convertDate(String dateStr, String pattern) {
		if (dateStr == null || "".equals(dateStr)) {
			return null;
		}
		if (pattern == null || "".equals(pattern)) {
			pattern = TimeUtil.getTimestampFormat(dateStr);
		}
		SimpleDateFormat formatter = new SimpleDateFormat(pattern);
		Date date = null;
		try {
			date = formatter.parse(dateStr);
		} catch (ParseException e) {
			e.printStackTrace();
		}
		return date;
	}
	/**
	 * 计算两个时间差，返回毫秒数(endDate-beginDate)
	 * @param beginDate
	 * @param endDate
	 * @return 
	 * @throws ParseException
	 */
	public static long getDifferenceMillisecond(Date beginDate, Date endDate) throws ParseException {
		long beginDateLong = 0L;
		long endDateLong = 0L;
		if (beginDate != null) {
			beginDateLong = beginDate.getTime();
		}
		if (endDate != null) {
			endDateLong = endDate.getTime();
		}
		return endDateLong - beginDateLong;
	}
	/**
	 * 计算两个时间差，返回毫秒数(endDate-beginDate)
	 * @param beginDateStr
	 * @param endDateStr
	 * @return 
	 * @throws ParseException
	 */
	public static long getDifferenceMillisecond(String beginDateStr, String endDateStr) throws ParseException {
		Date beginDate = convertDate(beginDateStr);
		Date endDate = convertDate(endDateStr);
		return getDifferenceMillisecond(beginDate, endDate);
	}
	/**
	 * 计算两个时间差，返回分钟数(endDate-beginDate)
	 * @param beginDate
	 * @param endDate
	 * @return
	 * @throws ParseException 
	 */
	public static int getDifferenceMinute(String beginDateStr, String endDateStr) throws ParseException {
		long diffMillisecond = getDifferenceMillisecond(beginDateStr, endDateStr);
		if (diffMillisecond > 0) {
			BigDecimal diffMillisecondBigDecimal = new BigDecimal(diffMillisecond);
			// 单位为分，四舍五入不保留小数
			BigDecimal diffMinuteBigDecimal = diffMillisecondBigDecimal.divide(new BigDecimal("60000"), 0,
					BigDecimal.ROUND_HALF_UP);
			return diffMinuteBigDecimal.intValue();
		} else {
			return 0;
		}
	}
	/**
	 * 计算两个时间差，返回字符串(endDate-beginDate)
	 * @param beginDateStr
	 * @param endDateStr
	 * @return
	 * @throws ParseException
	 */
	public static String getDifferenceString(String beginDateStr, String endDateStr) throws ParseException {
		long diffMillisecond = getDifferenceMillisecond(beginDateStr, endDateStr);
		if (diffMillisecond <= 60000) {
			return "0分钟";
		}
		BigDecimal diffMillisecondBigDecimal = new BigDecimal(diffMillisecond);
		BigDecimal diffMinuteBigDecimal = diffMillisecondBigDecimal.divide(new BigDecimal("60000"), 0,
				BigDecimal.ROUND_DOWN);
		BigDecimal diffHourBigDecimal = diffMinuteBigDecimal.divide(new BigDecimal("60"), 0, BigDecimal.ROUND_DOWN);
		BigDecimal diffdayBigDecimal = diffHourBigDecimal.divide(new BigDecimal("24"), 0, BigDecimal.ROUND_DOWN);
		int diffMinute = diffMinuteBigDecimal.subtract(diffHourBigDecimal.multiply(new BigDecimal("60"))).intValue();
		int diffHour = diffHourBigDecimal.subtract(diffdayBigDecimal.multiply(new BigDecimal("24"))).intValue();
		int diffDay = diffHourBigDecimal.subtract(diffdayBigDecimal.multiply(new BigDecimal("24"))).intValue();
		StringBuilder diffStr = new StringBuilder();
		if (diffDay > 0) {
			diffStr.append(diffDay).append("天");
		}
		if (diffHour > 0) {
			diffStr.append(diffHour).append("小时");
		}
		if (diffMinute > 0) {
			diffStr.append(diffMinute).append("分钟");
		}
		return diffStr.toString();
	}
}

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

@@ -1,9 +1,5 @@
package com.ai.ipu.server.util;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
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;
@@ -38,28 +34,4 @@ public class JingPingSendDateUtil {
		};
		publisher.publish(topic, publisherEvent);
	}
	/**
	 * 计算两个时间相隔的分钟数(endDate-beginDate)
	 * @param beginDate
	 * @param endDate
	 * @return
	 * @throws ParseException 
	 */
	public static int getBetweenMinuteValue(String beginDate, String endDate) throws ParseException {
		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
		long endDateLong = simpleDateFormat.parse(endDate).getTime();
		long beginDateLong = simpleDateFormat.parse(beginDate).getTime();
		long alarmLong = endDateLong - beginDateLong;
		if (alarmLong>0) {
			BigDecimal alarmLongBigDecimal = new BigDecimal(alarmLong);
			// 单位为分，四舍五入不保留小数
			alarmLongBigDecimal = alarmLongBigDecimal.divide(new BigDecimal("60000"), 0, BigDecimal.ROUND_HALF_UP);
			return alarmLongBigDecimal.intValue();
		}else {
			return 0;
		}
		
	}
}