实时救援问题修改

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

import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.StringUtils;
import com.ailk.org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;

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

     */
    @ResponseBody
    @RequestMapping("/queryEmployeeBindDeviceList")
    public CommonResponse<List<EmployeeTerminalRelaDto>> queryEmployeeBindDeviceList() {
    public CommonResponse<List<Map<String, Object>>> queryEmployeeBindDeviceList() {
        return userManageService.queryEmployeeBindDeviceList();
    }

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

			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("terminalId",responseMap.get("terminalId"));
			alarmMap.put("durationTime",DateUtil.getDifferenceString(alarmTimeLong,System.currentTimeMillis()));
			
			//alarmMap.put("businessType", alarmJsonObj.getString("businessType"));
			String businessType=alarmJsonObj.getString("businessType");
				}
			}
			
			//EntityPosition aaa=(EntityPosition)responseMap.get("rescueTargetEntityPosition");
			alarmMap.put("rescueTargetEntityPosition",responseMap.get("rescueTargetEntityPosition"));
			if (responseMap.get("rescueEntityPosition")==null) {
				alarmMap.put("rescueEntityPosition",null);
			
			if (responseMap.get("rescueWorkEmployeeRoleId")==null) {
				alarmMap.put("isAssignAlarm",EbcConstant.IS_ASSIGN_RESCUER_FALSE);
			}else {
				alarmMap.put("rescueEntityPosition",responseMap.get("rescueEntityPosition"));
	@Override
	public CommonResponse<EntityPosition> assignRescuer(WorkTaskRescue workTaskRescue) throws Exception {
		CommonRequest<WorkTaskRescue> commonRequest = new CommonRequest<WorkTaskRescue>(workTaskRescue);
		CommonResponse<WorkTaskRescue> response=rescueCommand.assignRescueEmployee(commonRequest);
		
		List<EntityPosition> list = entityPositionRepository.findByEntityId(workTaskRescue.getWorkTaskId());
		if (!CollectionUtils.isEmpty(list)) {
			return CommonResponse.ok(list.get(0));
		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.ok(null);
			return CommonResponse.fail("505", "指派失败");
		}
		
	}
	/**

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

	@Override
	public CommonResponse<ResourceTool> modifyEquipmentInfo(CommonRequest<ResourceTool> resourceToolCommonRequest)
			throws Exception {
		return resourceToolCommand.createWorkTool(resourceToolCommonRequest);
		return resourceToolCommand.modifyWorkTool(resourceToolCommonRequest);
	}
	@Override

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

	@Value("${seaMap.centre.latitude:31.560302}")
	private String latitude;
	@Value("${seaMap.scale:11}")
	@Value("${seaMap.scale:8}")
	private String scale;
	@Override

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

import com.ai.bss.location.rescue.model.EbcEntityPosition;
import com.ai.bss.location.rescue.model.EbcMapArea;
import com.ai.bss.location.rescue.service.interfaces.LocationManagementService;
import com.ai.bss.location.rescue.service.task.LocationMirrorTask;
import com.ai.bss.position.model.EntityPosition;
import com.ai.bss.position.model.MapArea;
import com.ai.bss.position.model.MapAreaBusinessType;
import com.ai.bss.position.service.api.outparam.LoadMapViewParam;
import com.ai.bss.work.tool.model.ResourceToolType;
import com.ai.bss.work.tool.service.api.ResourceToolQuery;
import com.ailk.org.apache.commons.lang3.StringUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.util.StringUtil;
import org.springframework.util.StringUtils;
@Service
public class LocationManagementServiceImpl implements LocationManagementService {
	@Autowired
	private ResourceToolQuery resourceToolQuery;
	@Autowired
	private LocationMirrorTask locationMirrorTask;
	/**
	 * 初始化人员定位详细数据
	 *
			resultMap.put("aggregatedMapAreaList",
					getMapAreaAllStatus(commonResponse.getData().getAggregatedMapAreaList()));
			resultMap.put("unaggregatedEntityPositionList",
					getEmployeeAllStatus(commonResponse.getData().getUnaggregatedEntityPositionList(), null));
					getEmployeeAllStatus(commonResponse.getData().getUnaggregatedEntityPositionList()));
		} else {
			resultMap.put("aggregatedMapAreaList", new ArrayList<MapArea>());
			resultMap.put("unaggregatedEntityPositionList", new ArrayList<EntityPosition>());
			EbcMapArea ebcMapArea = new EbcMapArea();
			ComponentReflectionUtils.copyAttributeFromParent(mapArea, ebcMapArea);
			if (!StringUtils.isEmpty(mapArea.getBusinessType())) {
				for (MapAreaBusinessType areaType : mapAreaTypeList) {
					if (areaType.getMapAreaBusinessType().equals(mapArea.getBusinessType())) {
						ebcMapArea.setAreaColor(areaType.getColor());
			boolean isAreaFlag=false;
			
			if (StringUtils.isNotEmpty(mapArea.getCoreEntityId())) {
				for (ResourceToolType toolType : toolTypeList) {
					if (toolType.getResourceToolType().equals(mapArea.getCoreEntityType())) {
						ebcMapArea.setToolIconUrl(toolType.getIconUrl());
						isAreaFlag=true;
						break;
					}
				}
			} else if (!StringUtils.isEmpty(mapArea.getCoreEntityId())) {
				for (ResourceToolType toolType : toolTypeList) {
					if (toolType.getResourceToolType().equals(mapArea.getCoreEntityId())) {
						ebcMapArea.setToolIconUrl(toolType.getIconUrl());
			}
			
			if (!isAreaFlag||StringUtils.isNotEmpty(mapArea.getBusinessType())) {
				for (MapAreaBusinessType areaType : mapAreaTypeList) {
					if (areaType.getMapAreaBusinessType().equals(mapArea.getBusinessType())) {
						ebcMapArea.setAreaColor(areaType.getColor());
						isAreaFlag=true;
						break;
					}
				}
			}
			String locationStatus = EntityPosition.TAG_TYPE_NORMAL;
			List<EbcEntityPosition> ebcEntityPositionList = getEmployeeAllStatus(mapArea.getEntityPositionList(),
					locationStatus);
			ebcMapArea.setEmployeeCount(ebcEntityPositionList.size());
			ebcMapArea.setLocationStatus(locationStatus);
			ebcMapArea.setEbcEntityPositionList(ebcEntityPositionList);
			ebcMapArea.setEntityPositionList(new ArrayList<EntityPosition>());
			ebcMapArea.setMapAreaShape(null);
			ebcMapAreaList.add(ebcMapArea);
			
			if (isAreaFlag) {
				Map<String, Object> ebcEntityPositionMap = getEmployeeAllStatus(mapArea.getEntityPositionList(),
						mapArea.getBusinessType());
				
				List<EbcEntityPosition> ebcEntityPositionList=(List<EbcEntityPosition>) ebcEntityPositionMap.get("ebcEntityPositionList");
				ebcMapArea.setEbcEntityPositionList(ebcEntityPositionList);
				ebcMapArea.setEmployeeCount(ebcEntityPositionList.size());
				ebcMapArea.setLocationStatus((String)ebcEntityPositionMap.get("locationStatus"));
				ebcMapArea.setEntityPositionList(new ArrayList<EntityPosition>());
				ebcMapArea.setMapAreaShape(null);
				ebcMapAreaList.add(ebcMapArea);
			}
		}
		return ebcMapAreaList;
	 * 获取人员的状态
	 *
	 * @param EntityPositionList
	 * @param mapAreaType
	 * @return
	 * @throws Exception
	 */
	@Override
	public List<EbcEntityPosition> getEmployeeAllStatus(List<EntityPosition> EntityPositionList, String locationStatus)
	public List<EbcEntityPosition> getEmployeeAllStatus(List<EntityPosition> EntityPositionList) throws Exception {
		Map<String, Object> resultMap=getEmployeeAllStatus(EntityPositionList, null);
		return (List<EbcEntityPosition>) resultMap.get("ebcEntityPositionList");
	}
	
	private Map<String, Object> getEmployeeAllStatus(List<EntityPosition> EntityPositionList, String mapAreaType)
			throws Exception {
		Map<String, Object> resultMap=new HashMap<String, Object>();
		String locationStatus=EntityPosition.TAG_TYPE_NORMAL;
		List<EbcEntityPosition> ebcEntityPositionList = new ArrayList<EbcEntityPosition>();
		if (CollectionUtils.isEmpty(EntityPositionList))
			return ebcEntityPositionList;
		
		//TODO 需判断不显示围栏(如考勤区、作业区)聚焦人员的信息
		//if (CollectionUtils.isEmpty(EntityPositionList)||"ATT".equals(mapAreaType)||"WOR".equals(mapAreaType)) {
		if (CollectionUtils.isEmpty(EntityPositionList)) {
			resultMap.put("ebcEntityPositionList", ebcEntityPositionList);
			resultMap.put("locationStatus", null);
			return resultMap;
		}
		List<String> entityPositionList=new ArrayList<String>();
		for (EntityPosition entityPosition : EntityPositionList) {
			if (entityPositionList.contains(entityPosition.getEntityId())) {
				continue;
			}
			
			EbcEntityPosition ebcEntityPosition = new EbcEntityPosition();
			ComponentReflectionUtils.copyAttributeFromParent(entityPosition, ebcEntityPosition);
			if (locationStatus != null) {
				locationStatus = locationStatus.compareTo(maxStatus) > 0 ? locationStatus : maxStatus;
			}
			
			entityPositionList.add(entityPosition.getEntityId());
		}
		return ebcEntityPositionList;
		
		resultMap.put("ebcEntityPositionList", ebcEntityPositionList);
		resultMap.put("locationStatus", locationStatus);
		
		return resultMap;
	}
	/**

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

    }
    @Override
    public CommonResponse<List<EmployeeTerminalRelaDto>> queryEmployeeBindDeviceList() {
        String entityId = "0000"; //TODO 组织id
        //根据组织编码查询该组织下绑定了终端的人员信息, 组织编码为空查询所有人员
        CommonRequest<String> param = CommonRequest.<String>builder().data(entityId).build();
        return employeeTerminalRelaQuery.queryIndividualDevRelaByOrgCode(param);
    public CommonResponse<List<Map<String, Object>>> queryEmployeeBindDeviceList() {
    	//根据组织编码查询该组织下绑定了终端的人员信息, 组织编码为空查询所有人员
        //String entityId = "0000"; //TODO 组织id
        //CommonRequest<String> param = CommonRequest.<String>builder().data(entityId).build();
    	CommonResponse<List<Map<String, Object>>> respones = employeeTerminalRelaQuery.findAllEmployeeTerminalRelaWithDistinct(CommonRequest.<Void>builder().build());
    	
        return respones;
    }
}

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

	 * @return
	 * @throws Exception
	 */
	List<EbcEntityPosition> getEmployeeAllStatus(List<EntityPosition> EntityPositionList, String locationStatus)
	List<EbcEntityPosition> getEmployeeAllStatus(List<EntityPosition> EntityPositionList)
			throws Exception;
	/**

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

	 * 获取已绑定终端的人员列表
	 * @return
	 */
	CommonResponse<List<EmployeeTerminalRelaDto>> queryEmployeeBindDeviceList();
	CommonResponse<List<Map<String, Object>>> queryEmployeeBindDeviceList();
}

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

			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
					if (characteristicSpecValue.getCode().equals(businessType)) {
						resultMap.put("businessType", characteristicSpecValue.getCode());
						resultMap.put("businessTypeZH", characteristicSpecValue.getValue());
						break;
					}
					break;
				}
			}
			

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

				resultMap.put("aggregatedMapAreaList", locationManagementService
						.getMapAreaAllStatus(commonRequest.getData().getAggregatedMapAreaList()));
				resultMap.put("unaggregatedEntityPositionList", locationManagementService
						.getEmployeeAllStatus(commonRequest.getData().getUnaggregatedEntityPositionList(), null));
						.getEmployeeAllStatus(commonRequest.getData().getUnaggregatedEntityPositionList()));
			} else {
				resultMap.put("aggregatedMapAreaList", new ArrayList<MapArea>());
				resultMap.put("unaggregatedEntityPositionList", new ArrayList<EntityPosition>());
			}
			resultMap.put("currentEntityPosition", commonRequest.getData().getCurrentEntityPosition());
			resultMap.put("currentEntityPosition",commonRequest.getData().getCurrentEntityPosition());
			resultMap.put("countMap", locationManagementService.loadEmployeeStatusCount());
			String msg = JSON.toJSONString(CommonResponse.ok(resultMap));

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

#\u6d77\u56fe\u663e\u793a\u6bd4\u4f8b\u5c3a
# 5-->300km,6-->200km,7-->100km,8-->50km,9-->20km,10-->10km,11-->5km
# 12-->2km,13-->1km,14-->500m,15-->300m,16-->200m,17-->100m,18-->50m
seaMap.scale=11
seaMap.scale=8