重构实时报警和历史报警

location-rescue-service/src/main/java/com/ai/bss/location/rescue/controller/AlarmManagementController.java

@@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.components.common.model.PageInfo;
import com.ai.bss.location.rescue.service.interfaces.AlarmManagementService;
import com.ai.bss.location.rescue.util.EbcConstant;
import com.ai.bss.work.rescue.model.WorkTaskRescue;
@@ -42,7 +41,7 @@ public class AlarmManagementController {
	 */
	@ResponseBody
	@RequestMapping("/loadAlarmDetails")
	public CommonResponse<Map<String, Object>> loadAlarmDetails() throws Exception {
	public CommonResponse<List<Map<String,Object>>> loadAlarmDetails() throws Exception {
		return alarmManagementService.loadAlarmDetails();
	}

location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/impl/AlarmManagementServiceImpl.java

@@ -9,6 +9,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
@@ -16,7 +17,6 @@ import com.ai.bss.characteristic.spec.model.CharacteristicSpec;
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
import com.ai.bss.characteristic.spec.service.api.CharacteristicSpecService;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.components.common.model.PageInfo;
import com.ai.bss.location.rescue.service.interfaces.AlarmManagementService;
import com.ai.bss.location.rescue.util.DateUtil;
import com.ai.bss.location.rescue.util.EbcConstant;
@@ -25,13 +25,12 @@ import com.ai.bss.position.service.api.MapAreaQuery;
import com.ai.bss.work.rescue.model.WorkTaskRescue;
import com.ai.bss.work.rescue.service.api.RescueCommand;
import com.ai.bss.work.rescue.service.api.RescueQueryService;
import com.ai.bss.work.task.model.common.WorkTask;
import com.ai.bss.work.tool.model.ResourceToolType;
import com.ai.bss.work.tool.service.api.ResourceToolQuery;
import com.ai.bss.worker.service.api.MapAreaTagQuery;
import com.alibaba.fastjson.JSONObject;
import org.springframework.util.CollectionUtils;
@Service
public class AlarmManagementServiceImpl implements AlarmManagementService {
	Logger logger = LoggerFactory.getLogger(AlarmManagementServiceImpl.class);
@@ -61,11 +60,53 @@ public class AlarmManagementServiceImpl implements AlarmManagementService {
	 * @throws Exception
	 */
	@Override
	public CommonResponse<Map<String, Object>> loadAlarmDetails() throws Exception {
		// CommonResponse<PageBean<WorkTaskRescue>> aaa=rescueQueryService.queryWorkTaskRescue(CommonRequest<Map<String,Object>> conditionMapRequest);
		return null;
	public CommonResponse<List<Map<String,Object>>> loadAlarmDetails() throws Exception {
		Map<String, Object> param = new HashMap<String, Object>();
		param.put("notStatus", WorkTask.END_STATUS);
		CommonRequest<Map<String, Object>> request =new CommonRequest(param);
		CommonResponse<List<Map<String,Object>>> response = rescueQueryService.queryWorkTaskRescue(request);
		
		if (CollectionUtils.isEmpty(response.getData())) {
			return CommonResponse.ok(new ArrayList<Map<String,Object>>());
		}
		
		CharacteristicSpec characteristicSpec = characteristicSpecService
				.findBusinessSpecByCharSpecCode(EbcConstant.BUSINESS_SPEC_MAP_AREA_TYPE);
		
		List<Map<String, Object>> alarmTaskList=new ArrayList<Map<String,Object>>();
		
		for (Map<String, Object> responseMap : response.getData()) {
			Map<String, Object> alarmMap=new HashMap<String, Object>();
			JSONObject alarmJsonObj=JSONObject.parseObject(responseMap.get("charValueSet").toString());
			
			alarmMap.put("workTaskId",responseMap.get("workTaskId"));
			long alarmTimeLong=Long.valueOf(alarmJsonObj.getString("alarmTime"));
			alarmMap.put("alarmTime",DateUtil.formatDate(alarmTimeLong));
			alarmMap.put("terminalId",responseMap.get("terminalId"));
			
			//alarmMap.put("businessType", alarmJsonObj.getString("businessType"));
			String businessType=alarmJsonObj.getString("businessType");
			for (CharacteristicSpecValue characteristicSpecValue : characteristicSpec.getCharacteristicSpecValues()) {
				if (characteristicSpecValue.getCode().equals(businessType)) {
					alarmMap.put("businessType", characteristicSpecValue.getCode());
					alarmMap.put("businessTypeZH", characteristicSpecValue.getValue());
					break;
				}
			}
			
			alarmMap.put("rescueTargetEntityPosition",responseMap.get("rescueTargetEntityPosition"));
			if (responseMap.get("rescueEntityPosition")==null) {
				alarmMap.put("rescueEntityPosition",null);
				alarmMap.put("isAssignAlarm",EbcConstant.IS_ASSIGN_RESCUER_FALSE);
			}else {
				alarmMap.put("rescueEntityPosition",responseMap.get("rescueEntityPosition"));
				alarmMap.put("isAssignAlarm",EbcConstant.IS_ASSIGN_RESCUER_TRUE);
			}
			
			alarmTaskList.add(alarmMap);
		}
		
		return CommonResponse.ok(alarmTaskList);
	}
	/**
@@ -146,8 +187,7 @@ public class AlarmManagementServiceImpl implements AlarmManagementService {
			return response;
		}
		
		List<Map<String, String>> AlarmTypeList=queryAlarmTypeList();
		List<Map<String, Object>> alarmTaskMap=new ArrayList<Map<String,Object>>();
		List<Map<String, Object>> alarmTaskList=new ArrayList<Map<String,Object>>();
		
		for (Map<String, Object> responseMap : response.getData().getData()) {
			Map<String, Object> alarmMap=new HashMap<String, Object>();
@@ -155,15 +195,39 @@ public class AlarmManagementServiceImpl implements AlarmManagementService {
			
			alarmMap.put("workTaskId",responseMap.get("workTaskId"));
			alarmMap.put("terminalId",responseMap.get("terminalId"));
			alarmMap.put("longitude",alarmJsonObj.getString("longitude"));
			alarmMap.put("latitude",alarmJsonObj.getString("latitude"));
			alarmMap.put("businessType", alarmJsonObj.getString("businessType"));
			alarmMap.put("targetUserId",responseMap.get("targetEmployeeRoleId"));
			alarmMap.put("targetUserName",responseMap.get("targetEmployeeRoleName"));
			alarmMap.put("rescueUserId",responseMap.get("rescueWorkEmployeeRoleId"));
			alarmMap.put("rescueUserName",responseMap.get("rescueWorkEmployeeRoleName"));
			alarmMap.put("alarmTime",DateUtil.formatDate(Long.valueOf(alarmJsonObj.getString("alarmTime"))));
			
			long alarmTimeLong=Long.valueOf(alarmJsonObj.getString("alarmTime"));
			alarmMap.put("alarmTime",DateUtil.formatDate(alarmTimeLong));
			
			if (responseMap.get("rescueWorkEmployeeRoleId")!=null) {
				alarmMap.put("rescueUserId",responseMap.get("rescueWorkEmployeeRoleId"));
				alarmMap.put("rescueUserName",responseMap.get("rescueWorkEmployeeRoleName"));
				if (responseMap.get("rescueCloseTime")!=null) {
					long rescueTimeLong=DateUtil.convertDate(responseMap.get("rescueCloseTime").toString()).getTime();
					alarmMap.put("rescueTime",responseMap.get("rescueCloseTime").toString());
					alarmMap.put("durationTime",DateUtil.getDifferenceString(alarmTimeLong, rescueTimeLong));
				}else {
					alarmMap.put("rescueTime","-");
					alarmMap.put("durationTime","-");
				}
				alarmMap.put("isFalseAlarm",EbcConstant.IS_ASSIGN_RESCUER_TRUE);
				
			}else {
				alarmMap.put("rescueUserId",null);
				alarmMap.put("rescueUserName","-");
				alarmMap.put("rescueTime","-");
				alarmMap.put("durationTime","-");
				alarmMap.put("isFalseAlarm",EbcConstant.IS_ASSIGN_RESCUER_FALSE);
			}
			
			alarmTaskList.add(alarmMap);
		}
		
		response.getData().setData(alarmTaskList);
		return response;
	}
@@ -178,7 +242,7 @@ public class AlarmManagementServiceImpl implements AlarmManagementService {
		CharacteristicSpec characteristicSpec = characteristicSpecService
				.findBusinessSpecByCharSpecCode(EbcConstant.BUSINESS_SPEC_MAP_AREA_TYPE);
		if (characteristicSpec == null) {
		if (characteristicSpec == null||CollectionUtils.isEmpty(characteristicSpec.getCharacteristicSpecValues())) {
			return new ArrayList<Map<String, String>>();
		}

location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/impl/LocationManagementServiceImpl.java

@@ -152,8 +152,8 @@ public class LocationManagementServiceImpl implements LocationManagementService
		String[][] resultArray = new String[traceList.size()][3];
		for (int i = 0; i < traceList.size(); i++) {
			String[] coordArray = new String[3];
			coordArray[0] = String.valueOf(traceList.get(i).get("longitude"));
			coordArray[1] = String.valueOf(traceList.get(i).get("latitude"));
			coordArray[0] = String.valueOf(traceList.get(i).get("latitude"));
			coordArray[1] = String.valueOf(traceList.get(i).get("longitude"));
			coordArray[2] = String.valueOf(traceList.get(i).get("createDate"));
			resultArray[i] = coordArray;
		}

location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/interfaces/AlarmManagementService.java

@@ -4,10 +4,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.components.common.model.PageInfo;
import com.ai.bss.work.rescue.model.WorkTaskRescue;
/**
@@ -22,7 +20,7 @@ public interface AlarmManagementService {
	 * @return
	 * @throws Exception
	 */
	CommonResponse<Map<String, Object>> loadAlarmDetails() throws Exception;
	CommonResponse<List<Map<String,Object>>> loadAlarmDetails() throws Exception;
	/**
	 * 查询地图标记和设备信息

location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/task/AlarmMirrorTask.java

@@ -1,15 +1,22 @@
package com.ai.bss.location.rescue.service.task;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.collections4.map.HashedMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.characteristic.spec.model.CharacteristicSpec;
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
import com.ai.bss.characteristic.spec.service.api.CharacteristicSpecService;
import com.ai.bss.location.rescue.util.DateUtil;
import com.ai.bss.location.rescue.util.EbcConstant;
import com.ai.bss.work.task.model.common.WorkTask;
import com.ai.bss.worker.service.api.EntityAlarmHandle;
import com.alibaba.fastjson.JSON;
@@ -19,6 +26,9 @@ import com.alibaba.fastjson.JSONObject;
public class AlarmMirrorTask implements EntityAlarmHandle {
	Logger logger = LoggerFactory.getLogger(AlarmMirrorTask.class);
	@Autowired
	private CharacteristicSpecService characteristicSpecService;
	
	/**
	 * 镜屏推送实时报警信息
	 *
@@ -30,15 +40,30 @@ public class AlarmMirrorTask implements EntityAlarmHandle {
		logger.debug("实时报警接收镜屏数据: " + JSON.toJSONString(workTask));
		try {
			String charValueSet = workTask.getData().getCharValueSet();
			JSONObject alarmInfJsonObj = JSONObject.parseObject(charValueSet);
			JSONObject alarmJsonObj = JSONObject.parseObject(charValueSet);
			Map<String, String> resultMap = new HashedMap<String, String>();
			resultMap.put("workTaskId", workTask.getData().getWorkTaskId());
			resultMap.put("employeeName", workTask.getData().getTargetEmployeeRoleName());
			resultMap.put("longitude", alarmInfJsonObj.getString("longitude"));
			resultMap.put("latitude", alarmInfJsonObj.getString("latitude"));
			resultMap.put("businessType", alarmInfJsonObj.getString("businessType"));
			resultMap.put("alarmTime", DateUtil.formatDate(Long.valueOf(alarmInfJsonObj.getString("alarmTime"))));
			resultMap.put("longitude", alarmJsonObj.getString("longitude"));
			resultMap.put("latitude", alarmJsonObj.getString("latitude"));
			resultMap.put("alarmTime", DateUtil.formatDate(Long.valueOf(alarmJsonObj.getString("alarmTime"))));
			//resultMap.put("businessType", alarmInfJsonObj.getString("businessType"));
			String businessType=alarmJsonObj.getString("businessType");
			CharacteristicSpec characteristicSpec = characteristicSpecService
					.findBusinessSpecByCharSpecCode(EbcConstant.BUSINESS_SPEC_MAP_AREA_TYPE);
			if (characteristicSpec!=null&&!CollectionUtils.isEmpty(characteristicSpec.getCharacteristicSpecValues())) {
				for (CharacteristicSpecValue characteristicSpecValue : characteristicSpec.getCharacteristicSpecValues()) {
					if (characteristicSpecValue.getCode().equals(businessType)) {
						resultMap.put("businessType", characteristicSpecValue.getCode());
						resultMap.put("businessTypeZH", characteristicSpecValue.getValue());
					}
					break;
				}
			}
			
			String msg = JSON.toJSONString(CommonResponse.ok(resultMap));
			logger.info("实时报警推送镜屏数据: " + msg);
			MirrorManagement.sendData(MirrorManagement.TOPIC_ALARM, msg);

location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/task/MirrorManagement.java

@@ -17,7 +17,7 @@ public class MirrorManagement {
	private static final Logger logger = LoggerFactory.getLogger(MirrorManagement.class);
	// 定位topic
	public static final String TOPIC_LOCATION = "location";
	public static final String TOPIC_LOCATION = "personnel";
	// 报警topic
	public static final String TOPIC_ALARM = "alarm";

location-rescue-service/src/main/java/com/ai/bss/location/rescue/util/DateUtil.java

@@ -213,7 +213,7 @@ public class DateUtil {
		SimpleDateFormat formatter = new SimpleDateFormat(pattern);
		return formatter.format(date);
	}
	
	/**
	 * 时间戳转字符串 
	 * @param date
@@ -230,7 +230,7 @@ public class DateUtil {
	 * @return
	 */
	public static String formatDate(long timestamp, String pattern) {
		Date date=new Date(timestamp);
		Date date = new Date(timestamp);
		SimpleDateFormat formatter = new SimpleDateFormat(pattern);
		return formatter.format(date);
	}
@@ -326,15 +326,36 @@ public class DateUtil {
	}
	/**
	 * 计算两个时间差，返回字符串(endDate-beginDate)
	 * @param beginDateStr
	 * @param endDateStr
	 * 计算两个时间差，返回字符串
	 * @param dateStr1
	 * @param dateStr2
	 * @return
	 * @throws Exception 
	 */
	public static String getDifferenceString(String beginDateStr, String endDateStr) throws Exception {
		long diffMillisecond = getDifferenceMillisecond(beginDateStr, endDateStr);
	public static String getDifferenceString(String dateStr1, String dateStr2) throws Exception {
		long diffMillisecond = Math.abs(getDifferenceMillisecond(dateStr1, dateStr2));
		return getDifferenceString(diffMillisecond);
	}
	/**
	 * 计算两个时间差，返回字符串
	 * @param dateLong1
	 * @param dateLong2
	 * @return
	 * @throws Exception 
	 */
	public static String getDifferenceString(long dateLong1, long dateLong2) throws Exception {
		long diffMillisecond = Math.abs(dateLong1 - dateLong2);
		return getDifferenceString(diffMillisecond);
	}
	/**
	 * 根据时间差，返回字符串(endDate-beginDate)
	 * @param diffMillisecond  时间差(毫秒)
	 * @return
	 * @throws Exception 
	 */
	public static String getDifferenceString(long diffMillisecond) throws Exception {
		if (diffMillisecond <= 60000) {
			return "0分钟";
		}