人员定位问题修改

location-rescue-service/pom.xml

@@ -155,6 +155,7 @@
        </dependency>
    </dependencies>
    <!--
    <repositories>
        <repository>
            <id>mgpd</id>
@@ -176,5 +177,6 @@
            </snapshots>
        </pluginRepository>
    </pluginRepositories>
    -->
</project>

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

@@ -25,6 +25,7 @@ import com.ai.bss.work.task.model.common.WorkTask;
/**
 * 报警救援管理
 *
 * @author konghl@asiainfo.com
 * 2020-11-13
 */
@@ -32,146 +33,167 @@ import com.ai.bss.work.task.model.common.WorkTask;
@RequestMapping("/alarmManagement")
public class AlarmManagementController {
	@Autowired
	AlarmManagementService alarmManagementService;
	/**
	 * 初始化实时报警数据
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/loadAlarmDetails")
	public CommonResponse<List<Map<String,Object>>> loadAlarmDetails() throws Exception {
		return alarmManagementService.loadAlarmDetails();
	}
	/**
	 * 查询地图标记和设备信息
	 * @param request
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/loadMapAreaTool")
	public CommonResponse<Map<String, Object>> loadMapAreaTool(HttpServletRequest request) throws Exception {
		HashMap<String, Object> dataMap = new HashMap<String, Object>();
		// TODO 组织ID 权限控制
		// JSONObject userInfo = new LoginUserInfoUtil().getUserInfo(request);
		// dataMap.put("entityId", userInfo.get("USER_ORG_ID").toString());
		// dataMap.put("workOrgId", userInfo.get("USER_ORG_ID").toString());
		dataMap.put("entityId", "1");
		dataMap.put("workOrgId", "0000");
		dataMap.put("isAllowBindTerminal", EbcConstant.TOOL_BIND_REJECT);
		return alarmManagementService.loadMapAreaTool(dataMap);
	}
	/**
	 * 指派救援
	 *
	 * @param params
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/assignRescuer")
	public CommonResponse<EntityPosition> assignRescuer(@RequestBody Map<String, String> params,
			HttpServletRequest request) throws Exception {
		if (params == null || StringUtils.isEmpty(params.get("workTaskId"))
				|| StringUtils.isEmpty(params.get("rescuersId"))) {
			return CommonResponse.fail("500", "指派失败");
		}
		WorkTaskRescue workTaskRescue = new WorkTaskRescue();
		workTaskRescue.setWorkTaskId(params.get("workTaskId"));
		workTaskRescue.setRescueWorkEmployeeRoleId(params.get("rescuersId"));
		workTaskRescue.setAssignTime(new Date());
		// TODO 获取当前登录者
		// JSONObject userInfo = new LoginUserInfoUtil().getUserInfo(request);
		// Object user_id = userInfo.get("ID");
		// workTaskRescue.setAssignWorkEmployeeRoleId(user_id);
		workTaskRescue.setAssignWorkEmployeeRoleId("2"); // 管理员
		return alarmManagementService.assignRescuer(workTaskRescue);
	}
	/**
	 * 关闭救援
	 *
	 * @param params
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/closeRescue")
	public CommonResponse<WorkTaskRescue> closeRescue(@RequestBody Map<String, String> params) throws Exception {
		if (params == null || StringUtils.isEmpty(params.get("workTaskId"))) {
			return CommonResponse.fail("500", "关闭失败");
		}
		WorkTaskRescue workTaskRescue = new WorkTaskRescue();
		workTaskRescue.setWorkTaskId(params.get("workTaskId"));
		workTaskRescue.setCloseTime(new Date());
		return alarmManagementService.closeRescue(workTaskRescue, params.get("isAssignAlarm"));
	}
	/**
	 *  分页查询历史报警
	 * @param request
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryPageCloseAlarmTask")
	public CommonResponse<PageBean<Map<String, Object>>> queryPageCloseAlarmTask(
			@RequestBody CommonRequest<Map<String, String>> request) throws Exception {
		// 当前页数
		int pageNumber = request.getPageNumber() < 1 ? 1 : request.getPageNumber();
		// 每页条数
		int pageSize = request.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE : request.getPageSize();
		Map<String, Object> dataMap = new HashMap<String, Object>();
		dataMap.put("status", WorkTask.END_STATUS);
		if (request != null && request.getData() != null) {
			dataMap.put("businessType", request.getData().get("businessType"));
			dataMap.put("startTime", request.getData().get("startTime"));
			dataMap.put("endTime", request.getData().get("endTime"));
		}
		return alarmManagementService.queryPageCloseAlarmTask(dataMap, pageNumber, pageSize);
	}
	/**
	 * 获取报警类型下拉列表
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryAlarmTypeList")
	public CommonResponse<List<Map<String, String>>> queryAlarmTypeList() throws Exception {
		List<Map<String, String>> resultList = alarmManagementService.queryAlarmTypeList();
		return CommonResponse.ok(resultList);
	}
	/**
	 * 删除历史报警
	 *
	* @param params
	* @return
	* @throws Exception
	*/
	@ResponseBody
	@RequestMapping("/deleteCloseAlarm")
	public  CommonResponse<WorkTaskRescue> deleteCloseAlarm(@RequestBody Map<String, String> params) throws Exception {
		if (params == null || StringUtils.isEmpty(params.get("workTaskId"))) {
			return CommonResponse.fail("500", "删除失败");
		}
		WorkTaskRescue workTaskRescue = new WorkTaskRescue();
    @Autowired
    AlarmManagementService alarmManagementService;
    /**
     * 初始化实时报警数据
     *
     * @return
     * @throws Exception
     */
    @ResponseBody
    @RequestMapping("/loadAlarmDetails")
    public CommonResponse<List<Map<String, Object>>> loadAlarmDetails() throws Exception {
        return alarmManagementService.loadAlarmDetails();
    }
    /**
     * 查询地图标记和设备信息
     *
     * @param request
     * @return
     * @throws Exception
     */
    @ResponseBody
    @RequestMapping("/loadMapAreaTool")
    public CommonResponse<Map<String, Object>> loadMapAreaTool(HttpServletRequest request) throws Exception {
        HashMap<String, Object> dataMap = new HashMap<String, Object>();
        // TODO 组织ID 权限控制
        // JSONObject userInfo = new LoginUserInfoUtil().getUserInfo(request);
        // dataMap.put("entityId", userInfo.get("USER_ORG_ID").toString());
        // dataMap.put("workOrgId", userInfo.get("USER_ORG_ID").toString());
        dataMap.put("entityId", "1");
        dataMap.put("workOrgId", "0000");
        dataMap.put("isAllowBindTerminal", EbcConstant.TOOL_BIND_REJECT);
        return alarmManagementService.loadMapAreaTool(dataMap);
    }
    /**
     * 指派救援
     *
     * @param params
     * @return
     * @throws Exception
     */
    @ResponseBody
    @RequestMapping("/assignRescuer")
    public CommonResponse<EntityPosition> assignRescuer(@RequestBody Map<String, String> params,
                                                        HttpServletRequest request) throws Exception {
        if (params == null || StringUtils.isEmpty(params.get("workTaskId"))
                || StringUtils.isEmpty(params.get("rescuersId"))) {
            return CommonResponse.fail("500", "指派失败");
        }
        WorkTaskRescue workTaskRescue = new WorkTaskRescue();
        workTaskRescue.setWorkTaskId(params.get("workTaskId"));
		
		return alarmManagementService.deleteCloseAlarm(workTaskRescue);
	}
        workTaskRescue.setRescueWorkEmployeeRoleId(params.get("rescuersId"));
        workTaskRescue.setAssignTime(new Date());
        // TODO 获取当前登录者
        // JSONObject userInfo = new LoginUserInfoUtil().getUserInfo(request);
        // Object user_id = userInfo.get("ID");
        // workTaskRescue.setAssignWorkEmployeeRoleId(user_id);
        workTaskRescue.setAssignWorkEmployeeRoleId("2"); // 管理员
        return alarmManagementService.assignRescuer(workTaskRescue);
    }
    /**
     * 关闭救援
     *
     * @param params
     * @return
     * @throws Exception
     */
    @ResponseBody
    @RequestMapping("/closeRescue")
    public CommonResponse<WorkTaskRescue> closeRescue(@RequestBody Map<String, String> params) throws Exception {
        if (params == null || StringUtils.isEmpty(params.get("workTaskId"))) {
            return CommonResponse.fail("500", "关闭失败");
        }
        WorkTaskRescue workTaskRescue = new WorkTaskRescue();
        workTaskRescue.setWorkTaskId(params.get("workTaskId"));
        workTaskRescue.setCloseTime(new Date());
        return alarmManagementService.closeRescue(workTaskRescue, params.get("isAssignAlarm"));
    }
    /**
     * 分页查询历史报警
     *
     * @param request
     * @return
     * @throws Exception
     */
    @ResponseBody
    @RequestMapping("/queryPageCloseAlarmTask")
    public CommonResponse<PageBean<Map<String, Object>>> queryPageCloseAlarmTask(
            @RequestBody CommonRequest<Map<String, String>> request) throws Exception {
        // 当前页数
        int pageNumber = request.getPageNumber() < 1 ? 1 : request.getPageNumber();
        // 每页条数
        int pageSize = request.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE : request.getPageSize();
        Map<String, Object> dataMap = new HashMap<String, Object>();
        dataMap.put("status", WorkTask.END_STATUS);
        if (request != null && request.getData() != null) {
            dataMap.put("businessType", request.getData().get("businessType"));
            dataMap.put("startTime", request.getData().get("startTime"));
            dataMap.put("endTime", request.getData().get("endTime"));
        }
        return alarmManagementService.queryPageCloseAlarmTask(dataMap, pageNumber, pageSize);
    }
    /**
     * 获取报警类型下拉列表
     *
     * @return
     * @throws Exception
     */
    @ResponseBody
    @RequestMapping("/queryAlarmTypeList")
    public CommonResponse<List<Map<String, String>>> queryAlarmTypeList() throws Exception {
        List<Map<String, String>> resultList = alarmManagementService.queryAlarmTypeList();
        return CommonResponse.ok(resultList);
    }
    /**
     * 删除历史报警
     *
     * @param params
     * @return
     * @throws Exception
     */
    @ResponseBody
    @RequestMapping("/deleteCloseAlarm")
    public CommonResponse<WorkTaskRescue> deleteCloseAlarm(@RequestBody Map<String, String> params) throws Exception {
        if (params == null || StringUtils.isEmpty(params.get("workTaskId"))) {
            return CommonResponse.fail("500", "删除失败");
        }
        WorkTaskRescue workTaskRescue = new WorkTaskRescue();
        workTaskRescue.setWorkTaskId(params.get("workTaskId"));
        return alarmManagementService.deleteCloseAlarm(workTaskRescue);
    }
    /**
     * 历史报警回放
     *
     * @param params
     * @return
     * @throws Exception
     */
    @ResponseBody
    @RequestMapping("/queryAlarmWorkTaskTrace")
    public CommonResponse<Map<String, Object>> queryAlarmWorkTaskTrace(@RequestBody Map<String, String> params) throws Exception {
        if (params == null || StringUtils.isEmpty(params.get("workTaskId"))) {
            return CommonResponse.fail("500", "获取轨迹失败");
        }
        return alarmManagementService.queryAlarmWorkTaskTrace(params.get("workTaskId"));
    }
}

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

@@ -4,6 +4,7 @@ package com.ai.bss.location.rescue.controller;
import java.util.HashMap;
import java.util.Map;
import com.ai.abc.api.model.CommonResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,10 +32,8 @@ public class GisParamController {
	 */
	@ResponseBody
	@RequestMapping("/seaMapParam")
	public Map<String,Object> getSeaMapParam() throws Exception {
	public CommonResponse<Map<String,Object>> getSeaMapParam() throws Exception {
		Map<String, Object> GisTokenMap = gisParamService.getSeaMapParam();
		Map<String,Object> result = new HashMap<String,Object>();
		result.put("result", GisTokenMap);
		return result;
		return CommonResponse.ok(GisTokenMap);
	}
}

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

@@ -35,257 +35,266 @@ import com.alibaba.fastjson.JSONObject;
@Service
public class AlarmManagementServiceImpl implements AlarmManagementService {
	Logger logger = LoggerFactory.getLogger(AlarmManagementServiceImpl.class);
	@Autowired
	private RescueCommand rescueCommand;
	@Autowired
	private RescueQueryService rescueQueryService;
	
	@Autowired
	private EntityPositionRepository entityPositionRepository;
	@Autowired
	private MapAreaTagQuery mapAreaTagQuery;
	@Autowired
	private MapAreaQuery mapAreaQuery;
	@Autowired
	private ResourceToolQuery resourceToolQuery;
	@Autowired
	private CharacteristicSpecService characteristicSpecService;
	/**
	 * 初始化实时报警数据
	 *
	 * @return
	 * @throws Exception
	 */
	@Override
	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"));
			alarmMap.put("terminalId",responseMap.get("terminalId"));
			long alarmTimeLong=Long.valueOf(alarmJsonObj.getString("alarmTime"));
			alarmMap.put("alarmTime",DateUtil.formatDate(alarmTimeLong));
			alarmMap.put("durationTime",DateUtil.getDifferenceString(alarmTimeLong,System.currentTimeMillis()));
			
			//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;
				}
			}
			
			//EntityPosition aaa=(EntityPosition)responseMap.get("rescueTargetEntityPosition");
			alarmMap.put("rescueTargetEntityPosition",responseMap.get("rescueTargetEntityPosition"));
			
			if (responseMap.get("rescueWorkEmployeeRoleId")==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);
	}
	/**
	 * 查询地图标记和设备信息
	 * @param dataMap
	 * @return
	 */
	@Override
	public CommonResponse<Map<String, Object>> loadMapAreaTool(HashMap<String, Object> dataMap) throws Exception {
		Map<String, Object> resultMap = new HashMap<String, Object>();
		List<MapAreaBusinessType> mapAreaTypeList = mapAreaQuery.queryAllMapAreaBusinessType(new CommonRequest(null))
				.getData();
		List<ResourceToolType> toolTypeList = resourceToolQuery.loadAllResourceToolType(new CommonRequest(null))
				.getData();
		List<Map<String, Object>> mapAreaList = mapAreaTagQuery
				.queryAllMapAreaByConditions(new CommonRequest<Map<String, Object>>(dataMap)).getData();
		List<Map<String, Object>> toolList = resourceToolQuery
				.queryWorkToolByOrgAndBindFlag(new CommonRequest<HashMap<String, Object>>(dataMap)).getData().getData();
		resultMap.put("mapAreaTypeList", mapAreaTypeList);
		resultMap.put("toolTypeList", toolTypeList);
		resultMap.put("mapAreaList", mapAreaList);
		resultMap.put("toolList", toolList);
		return CommonResponse.ok(resultMap);
	}
	/**
	 * 指派救援
	 * 
	 * @param workTaskRescue
	 * @return
	 * @throws Exception
	 */
	@Override
	public CommonResponse<EntityPosition> assignRescuer(WorkTaskRescue workTaskRescue) throws Exception {
		CommonRequest<WorkTaskRescue> commonRequest = new CommonRequest<WorkTaskRescue>(workTaskRescue);
		CommonResponse<WorkTaskRescue> response=rescueCommand.assignRescueEmployee(commonRequest);
		
		if (response.isSuccess()) {
			List<EntityPosition> list = entityPositionRepository.findByEntityId(workTaskRescue.getRescueWorkEmployeeRoleId());
			if (!CollectionUtils.isEmpty(list)) {
				return CommonResponse.ok(list.get(0));
			}else {
				return CommonResponse.ok(null);
			}
		}else {
			return CommonResponse.fail("505", "指派失败");
		}
	}
	/**
	 * 关闭救援
	 * 
	 * @param workTaskRescue
	 * @return
	 * @throws Exception
	 */
	@Override
	public CommonResponse<WorkTaskRescue> closeRescue(WorkTaskRescue workTaskRescue, String isFalseAlarm)
			throws Exception {
		CommonRequest<WorkTaskRescue> commonRequest = new CommonRequest<WorkTaskRescue>(workTaskRescue);
		if (EbcConstant.IS_ASSIGN_RESCUER_TRUE.equals(isFalseAlarm)) {
			return rescueCommand.closeTask(commonRequest);
		} else {
			return rescueCommand.falseAlarm(commonRequest);
		}
	}
	/**
	 *  分页查询历史报警数据
	 *  
	 * @param dataMap
	 * @param pageNumber
	 * @param pageSize
	 * @return
	 * @throws Exception
	 */
	@Override
	public CommonResponse<PageBean<Map<String, Object>>> queryPageCloseAlarmTask(Map<String, Object> dataMap, int pageNumber, int pageSize)
			throws Exception {
		CommonRequest<Map<String, Object>> request = new CommonRequest<Map<String, Object>>(dataMap,pageNumber, pageSize);
		CommonResponse<PageBean<Map<String, Object>>> response = rescueQueryService.queryHisWorkTaskRescue(request);
		
		if (CollectionUtils.isEmpty(response.getData().getData())) {
			return response;
		}
		
		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>();
			JSONObject alarmJsonObj=JSONObject.parseObject(responseMap.get("charValueSet").toString());
			
			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"));
			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;
	}
	/**
	 *  获取报警类型下拉列表
	 * @return
	 * @throws Exception
	 */
	@Override
	public List<Map<String, String>> queryAlarmTypeList() throws Exception {
		CharacteristicSpec characteristicSpec = characteristicSpecService
				.findBusinessSpecByCharSpecCode(EbcConstant.BUSINESS_SPEC_MAP_AREA_TYPE);
		if (characteristicSpec == null||CollectionUtils.isEmpty(characteristicSpec.getCharacteristicSpecValues())) {
			return new ArrayList<Map<String, String>>();
		}
		List<Map<String, String>> resultList = new ArrayList<Map<String, String>>();
		for (CharacteristicSpecValue characteristicSpecValue : characteristicSpec.getCharacteristicSpecValues()) {
			Map<String, String> map = new HashMap<String, String>();
			map.put("alarmTypeId", characteristicSpecValue.getCode());
			map.put("alarmTypeName", characteristicSpecValue.getValue());
			resultList.add(map);
		}
		return resultList;
	}
	/**
	 * 删除历史报警
	 * 
	* @param workTaskRescue
	* @return
	* @throws Exception
	*/
	@Override
	public CommonResponse<WorkTaskRescue> deleteCloseAlarm(WorkTaskRescue workTaskRescue) throws Exception {
		CommonRequest<WorkTaskRescue> commonRequest=new CommonRequest(workTaskRescue);
		return rescueCommand.deleteTask(commonRequest);
	}
    Logger logger = LoggerFactory.getLogger(AlarmManagementServiceImpl.class);
    @Autowired
    private RescueCommand rescueCommand;
    @Autowired
    private RescueQueryService rescueQueryService;
    @Autowired
    private EntityPositionRepository entityPositionRepository;
    @Autowired
    private MapAreaTagQuery mapAreaTagQuery;
    @Autowired
    private MapAreaQuery mapAreaQuery;
    @Autowired
    private ResourceToolQuery resourceToolQuery;
    @Autowired
    private CharacteristicSpecService characteristicSpecService;
    /**
     * 初始化实时报警数据
     *
     * @return
     * @throws Exception
     */
    @Override
    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"));
            alarmMap.put("terminalId", responseMap.get("terminalId"));
            long alarmTimeLong = Long.valueOf(alarmJsonObj.getString("alarmTime"));
            alarmMap.put("alarmTime", DateUtil.formatDate(alarmTimeLong));
            alarmMap.put("durationTime", DateUtil.getDifferenceString(alarmTimeLong, System.currentTimeMillis()));
            alarmMap.put("targetEmployeeRoleId", responseMap.get("targetEmployeeRoleId"));
            alarmMap.put("rescueWorkEmployeeRoleId", responseMap.get("rescueWorkEmployeeRoleId"));
            //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;
                }
            }
            //EntityPosition aaa=(EntityPosition)responseMap.get("rescueTargetEntityPosition");
            alarmMap.put("rescueTargetEntityPosition", responseMap.get("rescueTargetEntityPosition"));
            if (responseMap.get("rescueWorkEmployeeRoleId") == 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);
    }
    /**
     * 查询地图标记和设备信息
     *
     * @param dataMap
     * @return
     */
    @Override
    public CommonResponse<Map<String, Object>> loadMapAreaTool(HashMap<String, Object> dataMap) throws Exception {
        Map<String, Object> resultMap = new HashMap<String, Object>();
        List<MapAreaBusinessType> mapAreaTypeList = mapAreaQuery.queryAllMapAreaBusinessType(new CommonRequest(null))
                .getData();
        List<ResourceToolType> toolTypeList = resourceToolQuery.loadAllResourceToolType(new CommonRequest(null))
                .getData();
        List<Map<String, Object>> mapAreaList = mapAreaTagQuery
                .queryAllMapAreaByConditions(new CommonRequest<Map<String, Object>>(dataMap)).getData();
        List<Map<String, Object>> toolList = resourceToolQuery
                .queryWorkToolByOrgAndBindFlag(new CommonRequest<HashMap<String, Object>>(dataMap)).getData().getData();
        resultMap.put("mapAreaTypeList", mapAreaTypeList);
        resultMap.put("toolTypeList", toolTypeList);
        resultMap.put("mapAreaList", mapAreaList);
        resultMap.put("toolList", toolList);
        return CommonResponse.ok(resultMap);
    }
    /**
     * 指派救援
     *
     * @param workTaskRescue
     * @return
     * @throws Exception
     */
    @Override
    public CommonResponse<EntityPosition> assignRescuer(WorkTaskRescue workTaskRescue) throws Exception {
        CommonRequest<WorkTaskRescue> commonRequest = new CommonRequest<WorkTaskRescue>(workTaskRescue);
        CommonResponse<WorkTaskRescue> response = rescueCommand.assignRescueEmployee(commonRequest);
        if (response.isSuccess()) {
            List<EntityPosition> list = entityPositionRepository.findByEntityId(workTaskRescue.getRescueWorkEmployeeRoleId());
            if (!CollectionUtils.isEmpty(list)) {
                return CommonResponse.ok(list.get(0));
            } else {
                return CommonResponse.ok(null);
            }
        } else {
            return CommonResponse.fail("505", "指派失败");
        }
    }
    /**
     * 关闭救援
     *
     * @param workTaskRescue
     * @return
     * @throws Exception
     */
    @Override
    public CommonResponse<WorkTaskRescue> closeRescue(WorkTaskRescue workTaskRescue, String isFalseAlarm)
            throws Exception {
        CommonRequest<WorkTaskRescue> commonRequest = new CommonRequest<WorkTaskRescue>(workTaskRescue);
        if (EbcConstant.IS_ASSIGN_RESCUER_TRUE.equals(isFalseAlarm)) {
            return rescueCommand.closeTask(commonRequest);
        } else {
            return rescueCommand.falseAlarm(commonRequest);
        }
    }
    /**
     * 分页查询历史报警数据
     *
     * @param dataMap
     * @param pageNumber
     * @param pageSize
     * @return
     * @throws Exception
     */
    @Override
    public CommonResponse<PageBean<Map<String, Object>>> queryPageCloseAlarmTask(Map<String, Object> dataMap, int pageNumber, int pageSize)
            throws Exception {
        CommonRequest<Map<String, Object>> request = new CommonRequest<Map<String, Object>>(dataMap, pageNumber, pageSize);
        CommonResponse<PageBean<Map<String, Object>>> response = rescueQueryService.queryHisWorkTaskRescue(request);
        if (CollectionUtils.isEmpty(response.getData().getData())) {
            return response;
        }
        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>();
            JSONObject alarmJsonObj = JSONObject.parseObject(responseMap.get("charValueSet").toString());
            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"));
            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;
    }
    /**
     * 获取报警类型下拉列表
     *
     * @return
     * @throws Exception
     */
    @Override
    public List<Map<String, String>> queryAlarmTypeList() throws Exception {
        CharacteristicSpec characteristicSpec = characteristicSpecService
                .findBusinessSpecByCharSpecCode(EbcConstant.BUSINESS_SPEC_MAP_AREA_TYPE);
        if (characteristicSpec == null || CollectionUtils.isEmpty(characteristicSpec.getCharacteristicSpecValues())) {
            return new ArrayList<Map<String, String>>();
        }
        List<Map<String, String>> resultList = new ArrayList<Map<String, String>>();
        for (CharacteristicSpecValue characteristicSpecValue : characteristicSpec.getCharacteristicSpecValues()) {
            Map<String, String> map = new HashMap<String, String>();
            map.put("alarmTypeId", characteristicSpecValue.getCode());
            map.put("alarmTypeName", characteristicSpecValue.getValue());
            resultList.add(map);
        }
        return resultList;
    }
    /**
     * 删除历史报警
     *
     * @param workTaskRescue
     * @return
     * @throws Exception
     */
    @Override
    public CommonResponse<WorkTaskRescue> deleteCloseAlarm(WorkTaskRescue workTaskRescue) throws Exception {
        CommonRequest<WorkTaskRescue> commonRequest = new CommonRequest(workTaskRescue);
        return rescueCommand.deleteTask(commonRequest);
    }
    @Override
    public CommonResponse<Map<String, Object>> queryAlarmWorkTaskTrace(String workTaskId) throws Exception {
        CommonRequest<String> request = new CommonRequest(workTaskId);
        return rescueQueryService.queryWorkTaskRescuePositionTrace(request);
    }
}

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

@@ -38,7 +38,7 @@ public class EquipmentManageServiceImpl<EquipmentManageDao> implements Equipment
	@Override
	public CommonResponse<ResourceTool> modifyEquipmentInfo(CommonRequest<ResourceTool> resourceToolCommonRequest)
			throws Exception {
		return resourceToolCommand.modifyWorkTool(resourceToolCommonRequest);
		return resourceToolCommand.createWorkTool(resourceToolCommonRequest);
	}
	@Override

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

@@ -223,7 +223,6 @@ public class LocationManagementServiceImpl implements LocationManagementService
	 * 获取人员的状态
	 *
	 * @param EntityPositionList
	 * @param mapAreaType
	 * @return
	 * @throws Exception
	 */
@@ -253,6 +252,10 @@ public class LocationManagementServiceImpl implements LocationManagementService
				continue;
			}
			
			if (!"WOR".equals(entityPosition.getEntityType())) {
				continue;
			}
			
			EbcEntityPosition ebcEntityPosition = new EbcEntityPosition();
			ComponentReflectionUtils.copyAttributeFromParent(entityPosition, ebcEntityPosition);

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

@@ -11,70 +11,82 @@ import com.ai.bss.work.rescue.model.WorkTaskRescue;
/**
 * 报警救援管理
 *
 * @author konghl@asiainfo.com
 * 2020-11-13
 */
public interface AlarmManagementService {
	/**
	 * 初始化实时报警数据
	 * @return
	 * @throws Exception
	 */
	CommonResponse<List<Map<String,Object>>> loadAlarmDetails() throws Exception;
    /**
     * 初始化实时报警数据
     *
     * @return
     * @throws Exception
     */
    CommonResponse<List<Map<String, Object>>> loadAlarmDetails() throws Exception;
	/**
	 * 查询地图标记和设备信息
	 * @param dataMap
	 * @return
	 */
	CommonResponse<Map<String, Object>> loadMapAreaTool(HashMap<String, Object> dataMap) throws Exception ;
	
	/**
	 * 指派救援
	 * 
	 * @param workTaskRescue
	 * @return
	 * @throws Exception
	 */
	CommonResponse<EntityPosition> assignRescuer(WorkTaskRescue workTaskRescue) throws Exception;
    /**
     * 查询地图标记和设备信息
     *
     * @param dataMap
     * @return
     */
    CommonResponse<Map<String, Object>> loadMapAreaTool(HashMap<String, Object> dataMap) throws Exception;
	/**
	 * 关闭救援
	 * 
	 * @param workTaskRescue
	 * @param isFalseAlarm
	 * @return
	 * @throws Exception
	 */
	CommonResponse<WorkTaskRescue> closeRescue(WorkTaskRescue workTaskRescue, String isFalseAlarm) throws Exception;
    /**
     * 指派救援
     *
     * @param workTaskRescue
     * @return
     * @throws Exception
     */
    CommonResponse<EntityPosition> assignRescuer(WorkTaskRescue workTaskRescue) throws Exception;
	/**
	 *  分页查询历史报警
	 *  
	 * @param dataMap
	 * @param pageNumber
	 * @param pageSize
	 * @return
	 * @throws Exception
	 */
	CommonResponse<PageBean<Map<String, Object>>> queryPageCloseAlarmTask(Map<String, Object> dataMap, int pageNumber,
			int pageSize) throws Exception;
    /**
     * 关闭救援
     *
     * @param workTaskRescue
     * @param isFalseAlarm
     * @return
     * @throws Exception
     */
    CommonResponse<WorkTaskRescue> closeRescue(WorkTaskRescue workTaskRescue, String isFalseAlarm) throws Exception;
	/**
	 *  获取报警类型下拉列表
	 * @return
	 * @throws Exception
	 */
	List<Map<String,String>> queryAlarmTypeList() throws Exception;
	
	/**
	 * 删除历史报警
	 * 
	* @param workTaskRescue
	* @return
	* @throws Exception
	*/
	 CommonResponse<WorkTaskRescue> deleteCloseAlarm(WorkTaskRescue workTaskRescue) throws Exception;
    /**
     * 分页查询历史报警
     *
     * @param dataMap
     * @param pageNumber
     * @param pageSize
     * @return
     * @throws Exception
     */
    CommonResponse<PageBean<Map<String, Object>>> queryPageCloseAlarmTask(Map<String, Object> dataMap, int pageNumber,
                                                                          int pageSize) throws Exception;
    /**
     * 获取报警类型下拉列表
     *
     * @return
     * @throws Exception
     */
    List<Map<String, String>> queryAlarmTypeList() throws Exception;
    /**
     * 删除历史报警
     *
     * @param workTaskRescue
     * @return
     * @throws Exception
     */
    CommonResponse<WorkTaskRescue> deleteCloseAlarm(WorkTaskRescue workTaskRescue) throws Exception;
    /**
     * 历史报警回放
     *
     * @param workTaskId
     * @return
     * @throws Exception
     */
    CommonResponse<Map<String, Object>> queryAlarmWorkTaskTrace(String workTaskId) throws Exception;
}

location-rescue-service/src/main/resources/application.properties

@@ -19,8 +19,11 @@ spring.main.allow-bean-definition-overriding=true
#kafka
kafka.bootstrap-servers=47.105.160.21:9090
kafka.topic.deviceLocation=Topic_IoT_DeviceLocation
kafka.topic.alarm=Topic_IoT_IndividualAlarm
#kafka.bootstrap-servers=10.19.90.34:2182
#kafka.topic.deviceLocation=Topic_IoT_DeviceLocation
#kafka.topic.alarm=Topic_IoT_IndividualAlarm
kafka.topic.deviceLocation=DeviceLocationA
kafka.topic.alarm=IndividualAlarmA
kafka.producer.batch-size=16785
kafka.producer.retries=1
kafka.producer.buffer-memory=33554432