修改日期工具类

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

@@ -41,27 +41,32 @@ public class ReceiveSubscribeController {
		logger.info("已接收定位消息，消息为：" + msg);
		// 解析数据
		JSONObject msgMap=(JSONObject) JSONObject.parse(msg);
		
			String msgJson = (String) msgMap.get("dataPointValue");
			JSONObject detailInfo = JSONObject.parseObject(msgJson);
			JMap detailInfoMap = new JsonMap();
			detailInfoMap.put("deviceId", String.valueOf(msgMap.get("resourceId")));// 设备ID
			detailInfoMap.put("deviceNo", String.valueOf(msgMap.get("resourceId")));// 设备编码
			detailInfoMap.put("newDate", detailInfo.getJSONObject("msgDate").getString("value"));// 最新定位时间
			// 经度
			BigDecimal longitudeBigDecimal = detailInfo.getJSONObject("longitude").getBigDecimal("value");
			detailInfoMap.put("longitude",
					longitudeBigDecimal.setScale(EbcConstant.coord_scale, BigDecimal.ROUND_HALF_UP).toString());
			// 纬度
			BigDecimal latitudeBigDecimal = detailInfo.getJSONObject("latitude").getBigDecimal("value");
			detailInfoMap.put("latitude",
					latitudeBigDecimal.setScale(EbcConstant.coord_scale, BigDecimal.ROUND_HALF_UP).toString());
			// 解析并推送定位数据
			receiveSubscribeService.receiveIotLocationData(detailInfoMap);
		JSONObject msgMap = (JSONObject) JSONObject.parse(msg);
		if (msgMap == null || msgMap.isEmpty() || msgMap.get("dataPointValue") == null) {
			logger.info("定位消息的解析数据为空");
			return "dataPointValue is null";
		}
		String msgJson = String.valueOf(msgMap.get("dataPointValue"));
		JSONObject detailInfo = JSONObject.parseObject(msgJson);
		JMap detailInfoMap = new JsonMap();
		detailInfoMap.put("deviceId", String.valueOf(msgMap.get("resourceId")));// 设备ID
		detailInfoMap.put("deviceNo", String.valueOf(msgMap.get("resourceId")));// 设备编码
		detailInfoMap.put("newDate", detailInfo.getJSONObject("msgDate").getString("value"));// 最新定位时间
		// 经度
		BigDecimal longitudeBigDecimal = detailInfo.getJSONObject("longitude").getBigDecimal("value");
		detailInfoMap.put("longitude",
				longitudeBigDecimal.setScale(EbcConstant.coord_scale, BigDecimal.ROUND_HALF_UP).toString());
		// 纬度
		BigDecimal latitudeBigDecimal = detailInfo.getJSONObject("latitude").getBigDecimal("value");
		detailInfoMap.put("latitude",
				latitudeBigDecimal.setScale(EbcConstant.coord_scale, BigDecimal.ROUND_HALF_UP).toString());
		// 解析并推送定位数据
		receiveSubscribeService.receiveIotLocationData(detailInfoMap);
		return msg;
	}
@@ -77,30 +82,35 @@ public class ReceiveSubscribeController {
		logger.info("已接收告警消息，消息为：" + msg);
		// 解析数据
		JSONObject msgMap=(JSONObject) JSONObject.parse(msg);
		JSONObject msgMap = (JSONObject) JSONObject.parse(msg);
		if (msgMap == null || msgMap.isEmpty() || msgMap.get("dataPointValue") == null) {
			logger.info("定位消息的解析数据为空");
			return "dataPointValue is null";
		}
		
			String msgJson = (String) msgMap.get("dataPointValue");
			JSONObject detailInfo = JSONObject.parseObject(msgJson);
			JMap detailInfoMap = new JsonMap();
			detailInfoMap.put("deviceId", String.valueOf(msgMap.get("resourceId")));// 设备ID
			detailInfoMap.put("deviceNo", String.valueOf(msgMap.get("resourceId")));// 设备编码
			detailInfoMap.put("newDate", detailInfo.getJSONObject("msgDate").getString("value"));// 最新定位时间
			// 经度
			BigDecimal longitudeBigDecimal = detailInfo.getJSONObject("longitude").getBigDecimal("value");
			detailInfoMap.put("longitude",
					longitudeBigDecimal.setScale(EbcConstant.coord_scale, BigDecimal.ROUND_HALF_UP).toString());
			// 纬度
			BigDecimal latitudeBigDecimal = detailInfo.getJSONObject("latitude").getBigDecimal("value");
			detailInfoMap.put("latitude",
					latitudeBigDecimal.setScale(EbcConstant.coord_scale, BigDecimal.ROUND_HALF_UP).toString());
			//报警类型
			detailInfoMap.put("alarmType",detailInfo.getJSONObject("alarmType").getIntValue("value"));
			
			// 分析并推送报警数据
			receiveSubscribeService.receiveIotAlarmData(detailInfoMap);
		String msgJson = String.valueOf(msgMap.get("dataPointValue"));
		JSONObject detailInfo = JSONObject.parseObject(msgJson);
		JMap detailInfoMap = new JsonMap();
		detailInfoMap.put("deviceId", String.valueOf(msgMap.get("resourceId")));// 设备ID
		detailInfoMap.put("deviceNo", String.valueOf(msgMap.get("resourceId")));// 设备编码
		detailInfoMap.put("newDate", detailInfo.getJSONObject("msgDate").getString("value"));// 最新定位时间
		// 经度
		BigDecimal longitudeBigDecimal = detailInfo.getJSONObject("longitude").getBigDecimal("value");
		detailInfoMap.put("longitude",
				longitudeBigDecimal.setScale(EbcConstant.coord_scale, BigDecimal.ROUND_HALF_UP).toString());
		// 纬度
		BigDecimal latitudeBigDecimal = detailInfo.getJSONObject("latitude").getBigDecimal("value");
		detailInfoMap.put("latitude",
				latitudeBigDecimal.setScale(EbcConstant.coord_scale, BigDecimal.ROUND_HALF_UP).toString());
		// 报警类型
		detailInfoMap.put("alarmType", detailInfo.getJSONObject("alarmType").getIntValue("value"));
		// 分析并推送报警数据
		receiveSubscribeService.receiveIotAlarmData(detailInfoMap);
		return msg;

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

@@ -284,7 +284,7 @@ public class DeviceManageDaoImpl extends AbstractBizDao implements DeviceManageD
		String url = NorthboundInterfaceConstant.queryOneDeviceIncident;
		Map<String, String> map = northboundInterfaceUtil.iotPostCallUtil(url, dataMap);
		
		if (map==null) {
		if (map==null||map.isEmpty()) {
			logger.error("调用北向接口失败: return null,method="+NorthboundInterfaceConstant.queryOneDeviceIncident+",param="+JSONObject.toJSONString(dataMap));
			resultJMap.put("result", false);
			resultJMap.put("errMsg", "查询失败");
@@ -298,7 +298,7 @@ public class DeviceManageDaoImpl extends AbstractBizDao implements DeviceManageD
		
		List<Map> resultList = JSON.parseArray(JSONObject.toJSONString(map.get("result")), Map.class);
		
		if (resultList==null) {
		if (resultList==null||resultList.isEmpty()) {
			logger.info("queryOneDeviceLocationInfo 北向接口无返回数据  -->  "+paramsMap.get("resourceId")+"无轨迹数据");
			resultJMap.put("result", true);
			resultJMap.put("dataNum",0); //总条数
@@ -309,9 +309,9 @@ public class DeviceManageDaoImpl extends AbstractBizDao implements DeviceManageD
		resultJMap.put("dataNum",map.get("totalResultNumber")); //总条数
		resultJMap.put("deviceId",paramsMap.get("resourceId")); //设备id
		
		List<String> coordList=new ArrayList<String>();
		for (Map resultMap : resultList) {
			String msgJson = (String) resultMap.get("dataPointValue");
		String[][] resultArray=new String[resultList.size()][3];
		for (int i = 0; i < resultList.size(); i++) {
			String msgJson = (String) resultList.get(i).get("dataPointValue");
			JSONObject detailInfo = JSONObject.parseObject(msgJson);
			
			// 经度
@@ -320,10 +320,20 @@ public class DeviceManageDaoImpl extends AbstractBizDao implements DeviceManageD
			// 纬度
			BigDecimal latitudeBigDecimal= detailInfo.getJSONObject("latitude").getBigDecimal("value").setScale(EbcConstant.coord_scale, BigDecimal.ROUND_HALF_UP);
			
			String coord=longitudeBigDecimal.toString()+","+latitudeBigDecimal.toString();
			coordList.add(coord);
			//时间
			String msgDate=detailInfo.getJSONObject("msgDate").getString("value");// 定位时间
			String[] coordArray=new String[3];
			coordArray[0]=longitudeBigDecimal.toString();
			coordArray[1]=latitudeBigDecimal.toString();
			coordArray[2]=msgDate;
			
			resultArray[i]=coordArray;
		}
		
		resultJMap.put("coordArray", resultArray);
		resultJMap.put("result", true);
		
		return resultJMap;
	}
}

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

@@ -48,7 +48,7 @@ public class MapTagManageDaoImpl extends AbstractBizDao implements MapTagManageD
		// 获取数据列表
		List<Map<String, Object>> data = dao.executeSelect(sql.toString(), dataMap, pageNum, pageSize);
		
		// 获取总条数
		sql.insert(0, "select count(1) dataNum from ( ");
		sql.append(" ) a ");

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

@@ -1,6 +1,7 @@
package com.ai.ipu.server.service.impl;
import com.ai.ipu.server.enums.UserEnums;
import com.ai.ipu.server.util.DateUtil;
import com.ai.ipu.server.util.EbcConstant;
import com.github.pagehelper.PageInfo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -60,7 +61,7 @@ public class AreaInOutRecordServiceImpl implements AreaInOutRecordService {
		List<Map<String,Object>> pageInfoList = pageInfo.getList();
		for(Map<String,Object> areaInOutRecord:pageInfoList ){
			Date in_date = (Date)areaInOutRecord.get("IN_DATE");
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
			SimpleDateFormat sdf = new SimpleDateFormat(DateUtil.NORM_DATETIME_PATTERN);
			String inDateStr = sdf.format(in_date);       //将Date类型转换成String类型
			String [] arr2 = inDateStr.split(" ");
			areaInOutRecord.put("date",arr2[0]);

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

@@ -21,7 +21,6 @@ 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;
@Service
@@ -53,8 +52,8 @@ public class DeviceManageServiceImpl implements DeviceManageService {
		paramsMap.put("specId", EbcConstant.beidouDevice_product_id); // 所属产品
		paramsMap.put("terminalSN", params.getString("deviceNo")); // 终端序列号
		// 包含或不包含终端ID(用逗号隔开)
		if (bindDeviceBoolean || unBindDeviceBoolean) {
			// 获取已绑定的终端ids(用逗号隔开)
			StringBuilder deviceIds = new StringBuilder();
			for (int i = 0; i < allBindInfoList.size(); i++) {
				deviceIds.append(allBindInfoList.get(i).get("DEVICE_ID"));
@@ -63,9 +62,11 @@ public class DeviceManageServiceImpl implements DeviceManageService {
				}
			}
			if (unBindDeviceBoolean) {
			if (bindDeviceBoolean) {
				//只查询绑定的终端：包含
				paramsMap.put("resourceIdList", deviceIds.toString());
			} else if (unBindDeviceBoolean) {
				//只查询不绑定的终端：不包含
				paramsMap.put("notIn", deviceIds.toString());
			}
		}
@@ -216,7 +217,7 @@ public class DeviceManageServiceImpl implements DeviceManageService {
		mapTagTypeList.add(EbcConstant.area_type_temporariness);
		List<Map<String, Object>> areaViolationMapList = areaInOutRecordDao.getBeforeInAreaInfo(null, mapTagTypeList);
		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
		SimpleDateFormat simpleDateFormat = new SimpleDateFormat(DateUtil.NORM_DATETIME_PATTERN);
		// 拼接返回数据
		for (Map<String, String> map : list) {
@@ -345,31 +346,39 @@ public class DeviceManageServiceImpl implements DeviceManageService {
		String beginTime=null;//开始时间
		String endTime=null;//结束时间
		
		//时间段类型
		switch (params.getString("timeType")) {
		case EbcConstant.locus_time_interval_tenMinute:
			//10分钟
			beginTime="";
			endTime=TimeUtil.getSysTime();
			beginTime=DateUtil.dateAddMinute(endTime, -10);
			break;
		case EbcConstant.locus_time_interval_oneHour:
			//1小时
			beginTime="";
			endTime=TimeUtil.getSysTime();
			beginTime=DateUtil.dateAddHour(endTime, -1);
			break;
		case EbcConstant.locus_time_interval_oneDay:
			//1天
			beginTime="";
			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)) {
				resultJMap.put("result", false);
				resultJMap.put("errMsg", "日期不能为空");
				return resultJMap;
			}
			break;
		default:
			
			break;
			resultJMap.put("result", false);
			resultJMap.put("errMsg", "时间段无效");
			return resultJMap;
		}
		
		Map<String, String> paramsMap = new HashMap<String, String>();
		paramsMap.put("resourceId", params.getString("deviceId"));//终端ID
		paramsMap.put("startTime", beginTime);

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

@@ -9,9 +9,11 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import com.ai.ipu.common.http.UnirestUtil;
import com.ai.ipu.server.service.interfaces.GisTokenService;
import com.ai.ipu.server.util.HttpServiceUtil;
import com.alibaba.fastjson.JSON;
import com.mashape.unirest.http.Unirest;
@Service
public class GisTokenServiceImpl implements GisTokenService {
@@ -45,7 +47,8 @@ public class GisTokenServiceImpl implements GisTokenService {
		Charset charset = Charset.forName("utf-8");
		String resultJson = HttpServiceUtil.sendPost(tokenUrl, mapParams, charset);
		
		//UnirestUtil.requestByPost(url, param)
		logger.debug("已获取gisToken：" + resultJson);
		Map<String, Object> resultMap = JSON.parseObject(resultJson, Map.class);

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

@@ -31,7 +31,7 @@ public class TrackAnalysisServiceImpl implements TrackAnalysisService {
        PageInfo pageInfo = trackAnalysisDao.queryTrackAnalysisInfo(params, pageNum, pageSize);
        List<Map<String,Object>> pageInfoList = pageInfo.getList();
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        SimpleDateFormat sdf = new SimpleDateFormat(DateUtil.NORM_DATETIME_PATTERN);
        for(Map<String,Object> areaInOutRecord:pageInfoList ){
            for(Map<String,Object> userMap: userList){

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

@@ -86,7 +86,7 @@ public class ManageIotInAreaData {
		long minInAreaLong = System.currentTimeMillis();// 进入围栏最早的时间戳
		Map<String, Object> sendDataAreaInfo = null;// 用于推送镜屏的围栏信息
		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
		SimpleDateFormat simpleDateFormat = new SimpleDateFormat(DateUtil.NORM_DATETIME_PATTERN);
		for (int i = 0; i < currentAreaInfoList.size(); i++) {
			// 比较优先级

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

@@ -3,6 +3,7 @@ package com.ai.ipu.server.util;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import com.ai.ipu.common.date.TimeUtil;
@@ -14,6 +15,136 @@ import com.ai.ipu.common.date.TimeUtil;
 */
public class DateUtil {
	public static final String NORM_DATETIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
	public static final String NORM_DATETIME_MS_PATTERN = "yyyy-MM-dd HH:mm:ss.SSS";
	public static final String NORM_DATE_PATTERN = "yyyy-MM-dd";
	public static final String NORM_TIME_PATTERN = "HH:mm:ss";
	public static final String PURE_DATETIME_PATTERN = "yyyyMMddHHmmss";
	public static final String PURE_DATETIME_MS_PATTERN = "yyyyMMddHHmmssSSS";
	public static final String PURE_DATE_PATTERN = "yyyyMMdd";
	public static final String PURE_TIME_PATTERN = "HHmmss";
	public static final String EN_DATE_PATTERN = "yyyy/MM/dd";
	public static final String EN_DATETIME_PATTERN = "yyyy/MM/dd HH:mm:ss";
	public static final String CN_DATE_PATTERN = "yyyy年MM月dd日";
	public static final String CN_DATETIME_MINUTE_PATTERN = "yyyy年MM月dd日 HH:mm";
	public static final String CN_DATETIME_PATTERN = "yyyy年MM月dd日 HH:mm:ss";
	/**
	 * 在原日期加年数
	 * @param dateStr
	 * @param amount
	 * @return yyyy-MM-dd HH:mm:ss
	 */
	public static String dateAddYear(String dateStr, int amount) {
		return dateAdd(dateStr, Calendar.YEAR, amount, NORM_DATETIME_PATTERN);
	}
	
	/**
	 * 在原日期加月数
	 * @param dateStr
	 * @param amount
	 * @return yyyy-MM-dd HH:mm:ss
	 */
	public static String dateAddMonth(String dateStr, int amount) {
		return dateAdd(dateStr, Calendar.MONTH, amount, NORM_DATETIME_PATTERN);
	}
	
	/**
	 * 在原日期加天数
	 * @param dateStr
	 * @param amount
	 * @return yyyy-MM-dd HH:mm:ss
	 */
	public static String dateAddDay(String dateStr, int amount) {
		return dateAdd(dateStr, Calendar.DATE, amount, NORM_DATETIME_PATTERN);
	}
	
	/**
	 * 在原日期加小时数
	 * @param dateStr
	 * @param amount
	 * @return yyyy-MM-dd HH:mm:ss
	 */
	public static String dateAddHour(String dateStr, int amount) {
		return dateAdd(dateStr, Calendar.HOUR, amount, NORM_DATETIME_PATTERN);
	}
	
	/**
	 * 在原日期加分钟数
	 * @param dateStr
	 * @param amount
	 * @return yyyy-MM-dd HH:mm:ss
	 */
	public static String dateAddMinute(String dateStr, int amount) {
		return dateAdd(dateStr, Calendar.MINUTE, amount, NORM_DATETIME_PATTERN);
	}
	
	/**
	 * 在原日期加秒数
	 * @param dateStr
	 * @param amount
	 * @return yyyy-MM-dd HH:mm:ss
	 */
	public static String dateAddSecond(String dateStr, int amount) {
		return dateAdd(dateStr, Calendar.SECOND, amount, NORM_DATETIME_PATTERN);
	}
	/**
	 * 在原日期加一段时间间隔
	 * @param date 原日期
	 * @param field Calendar中的时间类型
	 * @param amount 间隔长度
	 * @param pattern 返回日期格式
	 * @return
	 */
	public static String dateAdd(String dateStr, int field, int amount, String pattern) {
		Date date = convertDate(dateStr);
		Date newDate = dateAdd(date, field, amount);
		return formatDate(newDate, pattern);
	}
	/**
	 * 在原日期加一段时间间隔
	 * @param date 原日期
	 * @param field Calendar中的时间类型
	 * @param amount 间隔长度
	 * @param pattern 返回日期格式
	 * @return
	 */
	public static String dateAdd(Date date, int field, int amount, String pattern) {
		Date newDate = dateAdd(date, field, amount);
		return formatDate(newDate, pattern);
	}
	/**
	 * 在原日期加一段时间间隔
	 * @param date 原日期
	 * @param field Calendar中的时间类型
	 * @param amount 间隔长度
	 * @return
	 */
	public static Date dateAdd(String dateStr, int field, int amount) {
		Date date = convertDate(dateStr);
		return dateAdd(date, field, amount);
	}
	/**
	 * 在原日期加一段时间间隔
	 * @param date 原日期
	 * @param field Calendar中的时间类型
	 * @param amount 间隔长度
	 * @return
	 */
	public static Date dateAdd(Date date, int field, int amount) {
		Calendar calendar = Calendar.getInstance();
		calendar.setTime(date);
		calendar.add(field, amount);
		return calendar.getTime();
	}
	/**
	 * 比较日期大小
	 * @param dateStr0
@@ -34,7 +165,7 @@ public class DateUtil {
	 */
	public static String formatStrDate(String dateStr) {
		Date date = convertDate(dateStr);
		return formatDate(date, "yyyy-MM-dd HH:mm:ss");
		return formatDate(date, DateUtil.NORM_DATETIME_PATTERN);
	}
	/**
@@ -43,7 +174,7 @@ public class DateUtil {
	 * @return yyyy-MM-dd HH:mm:ss
	 */
	public static String formatDate(Date date) {
		return formatDate(date, "yyyy-MM-dd HH:mm:ss");
		return formatDate(date, DateUtil.NORM_DATETIME_PATTERN);
	}
	/**

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

@@ -236,6 +236,7 @@ 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));
			StringEntity se = new StringEntity(JSONObject.toJSONString(paramsMap), encoding);
			httpPost.setEntity(se);
		}

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

@@ -38,7 +38,7 @@ url.gis.token=http://192.168.74.189:9999/gisIntf/account/gettoken
#iot\u7684\u5317\u5411\u63a5\u53e3\u6ce8\u518c\u5730\u5740
url.iot.login=http://60.205.219.67:8300/sso/login
#iot\u7684\u5317\u5411\u63a5\u53e3\u7edf\u4e00\u5730\u5740
url.iot.service=http://60.205.219.67:8081/dmp/terminalNorthApi/
url.iot.service=http://60.205.219.67:8300/dmp/terminalNorthApi/
#\u6d77\u56fe\u4e2d\u5fc3\u5750\u6807
seaMap.centre.longitude=123.396036