轨迹查询重构

location-rescue-service/pom.xml

@@ -9,7 +9,6 @@
        <version>2.1.5-SNAPSHOT</version>
    </parent>
    <groupId>com.ai.bss</groupId>
    <artifactId>location-rescue-service</artifactId>
    <version>1.0-SNAPSHOT</version>
@@ -20,24 +19,7 @@
            <artifactId>pagehelper</artifactId>
            <version>5.0.3</version>
        </dependency>
        <!--        <dependency>
                    <groupId>com.ai.ipu</groupId>
                    <artifactId>ipu-data</artifactId>
                    <version>3.1-SNAPSHOT</version>
                    <scope>compile</scope>
                </dependency>
                <dependency>
                    <groupId>com.ai.ipu</groupId>
                    <artifactId>ipu-basic</artifactId>
                    <version>3.1-SNAPSHOT</version>
                    <scope>compile</scope>
                </dependency>
                <dependency>
                    <groupId>com.ai.wade</groupId>
                    <artifactId>wade-common</artifactId>
                    <version>1.0</version>
                    <scope>compile</scope>
                </dependency>-->
        
        <dependency>
            <groupId>org.apache.httpcomponents</groupId>
            <artifactId>httpcore</artifactId>
@@ -75,18 +57,11 @@
            <version>2.1.5-SNAPSHOT</version>
        </dependency>
        <!-- <dependency>
            <groupId>com.ai.ipu</groupId>
            <artifactId>ipu-common</artifactId>
            <version>3.1-SNAPSHOT</version>
            <scope>compile</scope>
		<dependency>
            <groupId>com.ai.bss</groupId>
            <artifactId>work-attendance-service-api</artifactId>
            <version>2.1.5-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi-ooxml</artifactId>
            <version>3.14</version>
            <scope>compile</scope>
        </dependency>-->
        <dependency>
            <groupId>com.ai.bss</groupId>
@@ -103,7 +78,7 @@
        </dependency>
       <!-- uspa登录拦截效验-->
<!--        <dependency>
<!--   <dependency>
            <groupId>com.ai.bss</groupId>
            <artifactId>sso-util</artifactId>
            <version>1.0.0-RELEASE</version>
@@ -113,6 +88,37 @@
            <artifactId>sso-util</artifactId>
            <version>1.2</version>
        </dependency>
        
<!--	<dependency>
             <groupId>com.ai.ipu</groupId>
             <artifactId>ipu-data</artifactId>
             <version>3.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.ai.ipu</groupId>
             <artifactId>ipu-basic</artifactId>
             <version>3.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.ai.wade</groupId>
             <artifactId>wade-common</artifactId>
             <version>1.0</version>
             <scope>compile</scope>
         </dependency>
		<dependency>
            <groupId>com.ai.ipu</groupId>
            <artifactId>ipu-common</artifactId>
            <version>3.1-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi-ooxml</artifactId>
            <version>3.14</version>
            <scope>compile</scope>
        </dependency>-->
        <!-- 缓存 -->
        <dependency>

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

@@ -6,6 +6,7 @@ import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling;
import com.ai.ipu.server.connect.ConnectServerStart;
import com.ai.ipu.server.connect.util.ConnectServerManager;
@@ -17,7 +18,8 @@ import com.ai.ipu.server.stomp.WebSocketStompServer;
@EnableJpaRepositories(basePackages = "com.ai.bss")
@EntityScan(basePackages = {"com.ai.bss","com.ai.abc"})
@ComponentScan(basePackages = {"com.ai.bss","com.ai.abc"})
@EnableAsync
@EnableScheduling  //开启定时任务
@EnableAsync  //开启异步任务
@SpringBootApplication
public class LocationRescueApp {
    public static void main(String[] args) throws Exception {

location-rescue-service/src/main/java/com/ai/bss/location/rescue/config/MyCorsFilter.java

@@ -1,6 +1,9 @@
package com.ai.bss.location.rescue.config;
import com.ai.sso.filter.SessionUserFilter;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -8,9 +11,7 @@ import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import com.ai.sso.filter.SessionUserFilter;
/**
 * 解决接口跨域问题

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

@@ -1,14 +1,27 @@
package com.ai.bss.location.rescue.controller;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
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;
import com.ai.bss.work.task.model.common.WorkTask;
/**
 * 报警救援管理
@@ -29,8 +42,133 @@ public class AlarmManagementController {
	 */
	@ResponseBody
	@RequestMapping("/loadAlarmDetails")
	public CommonResponse<Map<String,Object>> loadAlarmDetails() throws Exception {
	public CommonResponse<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<WorkTaskRescue> 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("isFalseAlarm"));
	}
	/**
	 *  分页查询历史报警
	 * @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<Void> deleteCloseAlarm(@RequestBody Map<String, String> params) throws Exception {
		if (params == null || StringUtils.isEmpty(params.get("workTaskId"))) {
			return CommonResponse.fail("500", "删除失败");
		}
		return alarmManagementService.deleteCloseAlarm(params);
	}
}

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

@@ -1,20 +1,21 @@
package com.ai.bss.location.rescue.controller;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageInfo;
import com.ai.bss.location.rescue.service.interfaces.DeviceManageService;
import com.ai.bss.location.rescue.util.EbcConstant;
import com.ai.bss.location.rescue.util.NorthboundInterfaceConstant;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
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.PageInfo;
import com.ai.bss.location.rescue.service.interfaces.DeviceManageService;
import com.ai.bss.location.rescue.util.EbcConstant;
import com.ai.bss.location.rescue.util.NorthboundInterfaceConstant;
/**
 * 终端管理

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

@@ -17,13 +17,10 @@ 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.EquipmentManageService;
import com.ai.bss.location.rescue.util.EbcConstant;
import com.ai.bss.work.tool.model.ResourceTool;
import com.ai.bss.work.tool.model.ResourceToolType;
import com.ai.sso.util.LoginUserInfoUtil;
import com.alibaba.fastjson.JSONObject;
/**
 * 设备管理
@@ -101,14 +98,14 @@ public class EquipmentManageController {
	 */
	@ResponseBody
	@RequestMapping("/queryAllEquipmentNotBind")
	public CommonResponse<PageInfo<Map<String, Object>>> queryAllEquipmentNotBind(HttpServletRequest request) throws Exception {
		//TODO 权限控制
	public CommonResponse<List<Map<String, Object>>> queryAllEquipmentNotBind(HttpServletRequest request) throws Exception {
		HashMap<String, Object> dataMap = new HashMap<String, Object>();
		//TODO 组织ID 权限控制
		//JSONObject userInfo = new LoginUserInfoUtil().getUserInfo(request);
		//Object user_org_id = userInfo.get("USER_ORG_ID");
		return equipmentManageService.queryAllEquipmentNotBind();
        //dataMap.put("workOrgId", userInfo.get("USER_ORG_ID").toString());
		dataMap.put("workOrgId", "0000");
        dataMap.put("isAllowBindTerminal", EbcConstant.TOOL_BIND_REJECT);
		return equipmentManageService.queryAllEquipmentNotBind(dataMap);
	}
	
}

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

@@ -1,13 +1,18 @@
package com.ai.bss.location.rescue.controller;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.location.rescue.service.interfaces.LocationManagementService;
import java.util.HashMap;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.Map;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.location.rescue.service.interfaces.LocationManagementService;
import com.ai.bss.location.rescue.util.DateUtil;
import com.ai.bss.location.rescue.util.EbcConstant;
/**
 * 人员定位管理
@@ -28,10 +33,10 @@ public class LocationManagementController {
	 */
	@ResponseBody
	@RequestMapping("/loadLocationDetails")
	public CommonResponse<Map<String,Object>> loadLocationDetails() throws Exception {
	public CommonResponse<Map<String, Object>> loadLocationDetails() throws Exception {
		return locationManagementService.loadLocationDetails();
	}
	
	/**
	 * 初始化人员定位统计数据
	 * @return
@@ -39,9 +44,67 @@ public class LocationManagementController {
	 */
	@ResponseBody
	@RequestMapping("/loadEmployeeStatusCount")
	public CommonResponse<Map<String,Integer>> loadEmployeeStatusCount() throws Exception {
		Map<String,Integer> resultMap=locationManagementService.loadEmployeeStatusCount();
	public CommonResponse<Map<String, Integer>> loadEmployeeStatusCount() throws Exception {
		Map<String, Integer> resultMap = locationManagementService.loadEmployeeStatusCount();
		return CommonResponse.ok(resultMap);
	}
	/**
	 * 获取人员的轨迹
	 * 
	 * @param request
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryEmployeeTrace")
	public CommonResponse<Map<String, Object>> queryEmployeeTrace(@RequestBody Map<String, String> request)
			throws Exception {
		if (request == null || request.get("entityId") == null || request.get("timeType") == null) {
			CommonResponse.fail("502", "查询失败");
		}
		// 当前页码
		// int pageNum = Integer.parseInt(request.get("pageNum") < 1 ? 1 : Integer.parseInt(params.get("pageNum");
		int pageNumber = 1;
		// 每页条数
		// int pageSize = Integer.parseInt(params.get("pageSize") < 1 ? EbcConstant.track_playback_size : Integer.parseInt(params.get("pageSize");
		int pageSize = 10000;
		Map<String, Object> requestMap=new HashMap<String, Object>();
		requestMap.put("entityId", request.get("entityId"));
		
		String endTime = null;
		String startTime = null;
		switch (request.get("timeType")) {
		case EbcConstant.LOCUS_TIME_INTERVAL_TENMINUTE:
			endTime = DateUtil.getSysDateTime();
			startTime = DateUtil.dateAddMinute(endTime, -10);
			break;
		case EbcConstant.LOCUS_TIME_INTERVAL_ONEHOUR:
			endTime = DateUtil.getSysDateTime();
			startTime = DateUtil.dateAddHour(endTime, -1);
			break;
		case EbcConstant.LOCUS_TIME_INTERVAL_ONEDAY:
			endTime = DateUtil.getSysDateTime();
			startTime = DateUtil.dateAddDay(endTime, -1);
			break;
		case EbcConstant.LOCUS_TIME_INTERVAL_CUSTOM:
			startTime = request.get("startTime");
			endTime = request.get("endTime");
			if (startTime == null || "".equals(startTime) || endTime == null || "".equals(endTime)) {
				return CommonResponse.fail("503", "日期不能为空");
			}
			break;
		default:
			return CommonResponse.fail("504", "时间段无效");
		}
		requestMap.put("startTime", startTime);
		requestMap.put("endTime", endTime);
		return locationManagementService.queryEmployeeTrace(requestMap, pageNumber, pageSize);
	}
}

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

@@ -1,5 +1,16 @@
package com.ai.bss.location.rescue.controller;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
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;
@@ -8,16 +19,6 @@ import com.ai.bss.location.rescue.util.EbcConstant;
import com.ai.bss.position.model.MapArea;
import com.ai.bss.position.model.MapAreaBusinessType;
import com.ai.bss.worker.model.MapTagInfoDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * 地图标记
@@ -48,20 +49,6 @@ public class MapTagManageController {
	}
	/**
	 * 按部门查询所有围栏信息
	 *
	 * @param params
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryAllMapTagByOrg")
	public CommonResponse<List<Map<String, Object>>> queryAllMapTagByOrg(@RequestBody Map<String, String> params)
			throws Exception {
		return mapTagManageService.queryAllMapTagByOrg(params);
	}
	/**
	 * 查询单个围栏信息
	 *
	 * @param params
@@ -171,4 +158,21 @@ public class MapTagManageController {
		return mapTagManageService.deleteMapTagInfo(mapTagIdsList);
	}
	/**
	 * 按部门查询所有围栏信息
	 *
	 * @param params
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryAllMapAreaByOrg")
	public CommonResponse<List<Map<String, Object>>> queryAllMapTagByOrg(@RequestBody Map<String, String> params)
			throws Exception {
		Map<String, Object> dataMap = new HashMap<String, Object>();
		dataMap.put("entityId", params.get("entityId"));
		return mapTagManageService.queryAllMapAreaByOrg(dataMap);
	}
}

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

@@ -1,5 +1,14 @@
package com.ai.bss.location.rescue.controller;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
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.characteristic.spec.model.CharacteristicSpecValue;
@@ -10,14 +19,6 @@ import com.ai.bss.person.model.Organization;
import com.ai.bss.user.dto.EmployeeDto;
import com.ai.bss.user.dto.UserDto;
import com.ai.bss.worker.model.EmployeeTerminalRelaDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
import java.util.Map;
/**
 * 用户信息

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

@@ -1,54 +1,207 @@
package com.ai.bss.location.rescue.service.impl;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ai.abc.api.model.CommonRequest;
import com.ai.bss.location.rescue.util.MirrorSendDateUtil;
import com.ai.bss.work.task.model.common.WorkTask;
import com.ai.bss.worker.service.api.EntityAlarmHandle;
import com.alibaba.fastjson.JSON;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
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.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;
import com.ai.bss.position.model.MapAreaBusinessType;
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.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, EntityAlarmHandle {
public class AlarmManagementServiceImpl implements AlarmManagementService {
	Logger logger = LoggerFactory.getLogger(AlarmManagementServiceImpl.class);
	/*@Autowired
	MapAreaQuery mapAreaQuery;
	
	@Autowired
	EntityPositionQuery entityPositionQuery;
	
	private RescueCommand rescueCommand;
	@Autowired
	private RescueQueryService rescueQueryService;
	@Autowired
	private MapAreaTagQuery mapAreaTagQuery;
	@Autowired
	private MapAreaQuery mapAreaQuery;
	@Autowired
	ResourceToolQuery resourceToolQuery;*/
	
	private ResourceToolQuery resourceToolQuery;
	@Autowired
	private CharacteristicSpecService characteristicSpecService;
	/**
	 *初始化实时报警数据
	 * 初始化实时报警数据
	 *
	 * @return
	 * @throws Exception
	 */
	@Override
	public CommonResponse<Map<String, Object>> loadAlarmDetails() throws Exception {
		// CommonResponse<PageBean<WorkTaskRescue>> aaa=rescueQueryService.queryWorkTaskRescue(CommonRequest<Map<String,Object>> conditionMapRequest);
		return null;
	}
	/**
	 * 镜屏推送实时报警信息
	 * @param workTask
	 * 查询地图标记和设备信息
	 * @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<WorkTaskRescue> assignRescuer(WorkTaskRescue workTaskRescue) throws Exception {
		CommonRequest<WorkTaskRescue> commonRequest = new CommonRequest<WorkTaskRescue>(workTaskRescue);
		return rescueCommand.assignRescueEmployee(commonRequest);
	}
	/**
	 * 关闭救援
	 * 
	 * @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<Map<String, Object>> alarmHandle(CommonRequest<WorkTask> workTask) {
	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, String>> AlarmTypeList=queryAlarmTypeList();
		List<Map<String, Object>> alarmTaskMap=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("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"))));
			
			
			
		}
		String msg = JSON.toJSONString(CommonResponse.ok(workTask));
		logger.info("人员定位推送镜屏数据: " + msg);
		MirrorSendDateUtil.sendData(MirrorSendDateUtil.topic_personnel, msg);
		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) {
			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 params
	* @return
	* @throws Exception
	*/
	@Override
	public CommonResponse<Void> deleteCloseAlarm(Map<String, String> params) throws Exception {
		return null;
	}

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

@@ -1,5 +1,17 @@
package com.ai.bss.location.rescue.service.impl;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
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;
import com.ai.bss.characteristic.spec.model.CharacteristicSpec;
@@ -21,13 +33,6 @@ import com.ai.bss.worker.service.api.EmployeeTerminalRelaCommand;
import com.ai.bss.worker.service.api.EmployeeTerminalRelaQuery;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
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 java.util.*;
@Service
public class DeviceManageServiceImpl implements DeviceManageService {
@@ -40,19 +45,19 @@ public class DeviceManageServiceImpl implements DeviceManageService {
    private EmployeeTerminalRelaCommand employeeTerminalRelaCommand;
    @Autowired
    ResourceToolQuery resourceToolQuery;
    private ResourceToolQuery resourceToolQuery;
    @Autowired
    CharacteristicSpecService characteristicSpecService;
    private CharacteristicSpecService characteristicSpecService;
    @Autowired
    NorthboundInterfaceUtil northboundInterfaceUtil;
    private NorthboundInterfaceUtil northboundInterfaceUtil;
    @Autowired
    ResourceToolCommand resourceToolCommand;
    private ResourceToolCommand resourceToolCommand;
    @Autowired
    UserDtoQuery userDtoQuery;
    private UserDtoQuery userDtoQuery;
    @Override
    public PageInfo<Map<String, Object>> queryPageDeviceInfo(Map<String, String> params, int pageNumber, int pageSize)
@@ -206,7 +211,6 @@ public class DeviceManageServiceImpl implements DeviceManageService {
            }
        }
        // 返回数据
        PageInfo<Map<String, Object>> result = new PageInfo<Map<String, Object>>(Integer.valueOf(String.valueOf(deviceInfoListMap.get("totalResultNumber"))), resultList);
        return result;
    }

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

@@ -1,71 +1,72 @@
package com.ai.bss.location.rescue.service.impl;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
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.EquipmentManageService;
import com.ai.bss.location.rescue.util.EbcConstant;
import com.ai.bss.work.tool.model.ResourceTool;
import com.ai.bss.work.tool.model.ResourceToolType;
import com.ai.bss.work.tool.service.api.ResourceToolCommand;
import com.ai.bss.work.tool.service.api.ResourceToolQuery;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
public class EquipmentManageServiceImpl<EquipmentManageDao> implements EquipmentManageService {
    Logger logger = LoggerFactory.getLogger(EquipmentManageServiceImpl.class);
    @Autowired
    ResourceToolCommand resourceToolCommand;
	Logger logger = LoggerFactory.getLogger(EquipmentManageServiceImpl.class);
    @Autowired
    ResourceToolQuery resourceToolQuery;
	@Autowired
	private ResourceToolCommand resourceToolCommand;
    @Override
    public CommonResponse<PageBean<Map<String, Object>>> queryEquipmentInfo(CommonRequest<HashMap<String, Object>> conditionMap) throws Exception {
        return resourceToolQuery.queryWorkToolByConditions(conditionMap);
    }
	@Autowired
	private ResourceToolQuery resourceToolQuery;
	@Override
	public CommonResponse<PageBean<Map<String, Object>>> queryEquipmentInfo(
			CommonRequest<HashMap<String, Object>> conditionMap) throws Exception {
		return resourceToolQuery.queryWorkToolByConditions(conditionMap);
	}
    @Override
    public CommonResponse<ResourceTool> modifyEquipmentInfo(CommonRequest<ResourceTool> resourceToolCommonRequest) throws Exception {
        return resourceToolCommand.createWorkTool(resourceToolCommonRequest);
    }
	@Override
	public CommonResponse<ResourceTool> modifyEquipmentInfo(CommonRequest<ResourceTool> resourceToolCommonRequest)
			throws Exception {
		return resourceToolCommand.createWorkTool(resourceToolCommonRequest);
	}
    @Override
    public CommonResponse<ResourceTool> createEquipmentInfo(CommonRequest<ResourceTool> resourceToolCommonRequest) {
        return resourceToolCommand.createWorkTool(resourceToolCommonRequest);
    }
	@Override
	public CommonResponse<ResourceTool> createEquipmentInfo(CommonRequest<ResourceTool> resourceToolCommonRequest) {
		return resourceToolCommand.createWorkTool(resourceToolCommonRequest);
	}
    @Override
    public CommonResponse<List<ResourceToolType>> loadAllResourceToolType(CommonRequest commonRequest) {
        return resourceToolQuery.loadAllResourceToolType(commonRequest);
    }
	@Override
	public CommonResponse<List<ResourceToolType>> loadAllResourceToolType(CommonRequest commonRequest) {
		return resourceToolQuery.loadAllResourceToolType(commonRequest);
	}
    @Override
    public CommonResponse<ResourceTool> deleteEquipmentInfo(CommonRequest<List<String>> resourceToolCommonRequest) throws Exception {
        //删除绑定终端关系
        resourceToolCommand.deleteWorkToolsDevRelaByWorkToolId(resourceToolCommonRequest);
        //删除设备信息
        return resourceToolCommand.deleteWorkTool(resourceToolCommonRequest);
    }
	@Override
	public CommonResponse<ResourceTool> deleteEquipmentInfo(CommonRequest<List<String>> resourceToolCommonRequest)
			throws Exception {
		// 删除绑定终端关系
		resourceToolCommand.deleteWorkToolsDevRelaByWorkToolId(resourceToolCommonRequest);
		// 删除设备信息
		return resourceToolCommand.deleteWorkTool(resourceToolCommonRequest);
	}
    @Override
    public CommonResponse<PageInfo<Map<String, Object>>> queryAllEquipmentNotBind() throws Exception {
        HashMap<String, Object> dataMap = new HashMap<>();
        dataMap.put("workOrgId", "0000");//TODO 组织ID
        dataMap.put("isAllowBindTerminal", EbcConstant.TOOL_BIND_REJECT);//是否可绑定
        CommonRequest<HashMap<String, Object>> commonRequest = new CommonRequest<HashMap<String, Object>>(dataMap);
        return resourceToolQuery.queryWorkToolByOrgAndBindFlag(commonRequest);
    }
	@Override
	public CommonResponse<List<Map<String, Object>>> queryAllEquipmentNotBind(HashMap<String, Object> dataMap)
			throws Exception {
		CommonRequest<HashMap<String, Object>> request = new CommonRequest<HashMap<String, Object>>(dataMap);
		CommonResponse<PageInfo<Map<String, Object>>> response = resourceToolQuery
				.queryWorkToolByOrgAndBindFlag(request);
		return CommonResponse.ok(response.getData().getData());
	}
}

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

@@ -5,7 +5,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.github.pagehelper.util.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,11 +13,12 @@ import org.springframework.util.CollectionUtils;
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.util.ComponentReflectionUtils;
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.util.MirrorSendDateUtil;
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;
@@ -27,22 +27,26 @@ import com.ai.bss.position.service.api.MapAreaQuery;
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.ai.bss.worker.service.api.EntityPositionChangeHandle;
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, EntityPositionChangeHandle {
public class LocationManagementServiceImpl implements LocationManagementService {
	Logger logger = LoggerFactory.getLogger(LocationManagementServiceImpl.class);
	@Autowired
	MapAreaQuery mapAreaQuery;
	private MapAreaQuery mapAreaQuery;
	@Autowired
	private EntityPositionQuery entityPositionQuery;
	@Autowired
	EntityPositionQuery entityPositionQuery;
	private ResourceToolQuery resourceToolQuery;
	@Autowired
	ResourceToolQuery resourceToolQuery;
	private LocationMirrorTask locationMirrorTask;
	/**
	 * 初始化人员定位详细数据
@@ -125,36 +129,37 @@ public class LocationManagementServiceImpl implements LocationManagementService,
	}
	/**
	 * 镜屏推送实体位置变动信息
	 *
	 * @param commonRequest
	 * 获取人员的轨迹
	 * @param requestMap
	 * @return
	 * @throws Exception
	 */
	@Override
	public CommonResponse<Map<String, Object>> entityPositionChange(CommonRequest<LoadMapViewParam> commonRequest) {
		try {
			Map<String, Object> resultMap = new HashMap<String, Object>();
			if (commonRequest != null && commonRequest.getData() != null) {
				resultMap.put("aggregatedMapAreaList",
						getMapAreaAllStatus(commonRequest.getData().getAggregatedMapAreaList()));
				resultMap.put("unaggregatedEntityPositionList",
						getEmployeeAllStatus(commonRequest.getData().getUnaggregatedEntityPositionList(), null));
			} else {
				resultMap.put("aggregatedMapAreaList", new ArrayList<MapArea>());
				resultMap.put("unaggregatedEntityPositionList", new ArrayList<EntityPosition>());
			}
			resultMap.put("countMap", loadEmployeeStatusCount());
	public CommonResponse<Map<String, Object>> queryEmployeeTrace(Map<String, Object> requestMap, int pageNumber,
			int pageSize) throws Exception {
		CommonRequest<Map<String, Object>> commonRequest = new CommonRequest<Map<String, Object>>(requestMap,
				pageNumber, pageSize);
		CommonResponse<PageBean<Map<String, Object>>> response = entityPositionQuery
				.queryEntityTraceByCondition(commonRequest);
		if (response == null || response.getData() == null || CollectionUtils.isEmpty(response.getData().getData())) {
			return CommonResponse.fail("505", "无轨迹信息");
		}
		List<Map<String, Object>> traceList = response.getData().getData();
			String msg = JSON.toJSONString(CommonResponse.ok(resultMap));
			logger.info("人员定位推送镜屏数据: " + msg);
			MirrorSendDateUtil.sendData(MirrorSendDateUtil.topic_personnel, msg);
		requestMap.put("traceNum", traceList.size());
		} catch (Exception e) {
			logger.error("人员定位推送镜屏失败,data: " + JSON.toJSONString(commonRequest));
		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[2] = String.valueOf(traceList.get(i).get("createDate"));
			resultArray[i] = coordArray;
		}
		return null;
		requestMap.put("coordArray", resultArray);
		return CommonResponse.ok(requestMap);
	}
	/**
@@ -164,7 +169,8 @@ public class LocationManagementServiceImpl implements LocationManagementService,
	 * @return
	 * @throws Exception
	 */
	private List<EbcMapArea> getMapAreaAllStatus(List<MapArea> mapAreaList) throws Exception {
	@Override
	public List<EbcMapArea> getMapAreaAllStatus(List<MapArea> mapAreaList) throws Exception {
		List<EbcMapArea> ebcMapAreaList = new ArrayList<EbcMapArea>();
		if (CollectionUtils.isEmpty(mapAreaList))
			return ebcMapAreaList;
@@ -178,14 +184,14 @@ public class LocationManagementServiceImpl implements LocationManagementService,
			EbcMapArea ebcMapArea = new EbcMapArea();
			ComponentReflectionUtils.copyAttributeFromParent(mapArea, ebcMapArea);
			if (!StringUtil.isEmpty(mapArea.getBusinessType())) {
			if (!StringUtils.isEmpty(mapArea.getBusinessType())) {
				for (MapAreaBusinessType areaType : mapAreaTypeList) {
					if (areaType.getMapAreaBusinessType().equals(mapArea.getBusinessType())) {
						ebcMapArea.setAreaColor(areaType.getColor());
						break;
					}
				}
			} else if (!StringUtil.isEmpty(mapArea.getCoreEntityId())) {
			} else if (!StringUtils.isEmpty(mapArea.getCoreEntityId())) {
				for (ResourceToolType toolType : toolTypeList) {
					if (toolType.getResourceToolType().equals(mapArea.getCoreEntityId())) {
						ebcMapArea.setToolIconUrl(toolType.getIconUrl());
@@ -216,7 +222,8 @@ public class LocationManagementServiceImpl implements LocationManagementService,
	 * @return
	 * @throws Exception
	 */
	private List<EbcEntityPosition> getEmployeeAllStatus(List<EntityPosition> EntityPositionList, String locationStatus)
	@Override
	public List<EbcEntityPosition> getEmployeeAllStatus(List<EntityPosition> EntityPositionList, String locationStatus)
			throws Exception {
		List<EbcEntityPosition> ebcEntityPositionList = new ArrayList<EbcEntityPosition>();
		if (CollectionUtils.isEmpty(EntityPositionList))
@@ -229,8 +236,8 @@ public class LocationManagementServiceImpl implements LocationManagementService,
			String maxStatus = getEntityPositionStatus(entityPosition);
			ebcEntityPosition.setLocationStatus(maxStatus);
			ebcEntityPositionList.add(ebcEntityPosition);
			
			if (locationStatus!=null) {
			if (locationStatus != null) {
				locationStatus = locationStatus.compareTo(maxStatus) > 0 ? locationStatus : maxStatus;
			}
		}
@@ -244,10 +251,11 @@ public class LocationManagementServiceImpl implements LocationManagementService,
	 * @param entityPosition
	 * @return
	 */
	private String getEntityPositionStatus(EntityPosition entityPosition) {
	@Override
	public String getEntityPositionStatus(EntityPosition entityPosition) {
		String maxStatus = EntityPosition.TAG_TYPE_NORMAL;
		JSONObject statusJsonObj = JSONObject.parseObject(entityPosition.getCharValueSet());
		if (statusJsonObj!=null) {
		if (statusJsonObj != null) {
			List tagList = (List) statusJsonObj.get(EntityPosition.TAG_FIELD_NAME);
			for (Object tagObj : tagList) {

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

@@ -1,30 +1,21 @@
package com.ai.bss.location.rescue.service.impl;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
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.components.common.model.PageBean;
import com.ai.bss.location.rescue.service.interfaces.MapTagManageService;
import com.ai.bss.location.rescue.util.EbcConstant;
import com.ai.bss.position.model.MapArea;
import com.ai.bss.position.model.MapAreaBusinessType;
import com.ai.bss.position.service.api.MapAreaQuery;
import com.ai.bss.user.dto.UserDto;
import com.ai.bss.user.service.api.UserDtoQuery;
import com.ai.bss.worker.model.MapTagInfoDto;
import com.ai.bss.worker.service.api.MapAreaTagCommand;
import com.ai.bss.worker.service.api.MapAreaTagQuery;
import com.google.common.collect.Maps;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
public class MapTagManageServiceImpl implements MapTagManageService {
@@ -38,36 +29,26 @@ public class MapTagManageServiceImpl implements MapTagManageService {
	@Autowired
	private MapAreaQuery mapAreaQuery;
	@Autowired
	CharacteristicSpecService characteristicSpecService;
	@Override
	public CommonResponse<PageBean<Map<String, Object>>> queryPageMapTagInfo(Map<String,String> params, int pageNumber, int pageSize) throws Exception {
	public CommonResponse<PageBean<Map<String, Object>>> queryPageMapTagInfo(Map<String, String> params, int pageNumber,
			int pageSize) throws Exception {
		Map<String, Object> data = new HashMap<String, Object>();
		if (params!=null) {
			data.put("mapAreaName", params.get("mapAreaName"));  //围栏名称模糊查询
			data.put("entityId",params.get("entityId"));//所属部门
			data.put("businessType",params.get("mapAreaType"));//围栏类型
		if (params != null) {
			data.put("mapAreaName", params.get("mapAreaName")); // 围栏名称模糊查询
			data.put("entityId", params.get("entityId"));// 所属部门
			data.put("businessType", params.get("mapAreaType"));// 围栏类型
		}
		CommonRequest<Map<String, Object>> commonRequest = new CommonRequest<Map<String, Object>>(data, pageNumber, pageSize);
		CommonRequest<Map<String, Object>> commonRequest = new CommonRequest<Map<String, Object>>(data, pageNumber,
				pageSize);
		return mapAreaTagQuery.queryMapAreaTag(commonRequest);
	}
	@Override
	public CommonResponse<List<Map<String, Object>>> queryAllMapTagByOrg(Map<String, String> params) throws Exception {
	public CommonResponse<List<Map<String, Object>>> queryOneMapTagInfo(Map<String, String> params) throws Exception {
		Map<String, Object> data = new HashMap<String, Object>();
		data.put("entityId",params.get("entityId"));
		CommonRequest<Map<String, Object>> commonRequest = new CommonRequest<Map<String, Object>>(data);
		 return mapAreaTagQuery.queryAllMapAreaByConditions(commonRequest);
	}
	@Override
	public CommonResponse<List<Map<String, Object>>> queryOneMapTagInfo(Map<String,String> params) throws Exception {
		Map<String, Object> data = new HashMap<String, Object>();
		data.put("mapAreaId", params.get("mapTagId")); //根据主键查询
		data.put("mapAreaId", params.get("mapTagId")); // 根据主键查询
		CommonRequest<Map<String, Object>> commonRequest = new CommonRequest<Map<String, Object>>(data);
		return mapAreaTagQuery.queryAllMapAreaByConditions(commonRequest);
@@ -96,4 +77,9 @@ public class MapTagManageServiceImpl implements MapTagManageService {
		return mapAreaTagCommand.deleteMapArea(param);
	}
	@Override
	public CommonResponse<List<Map<String, Object>>> queryAllMapAreaByOrg(Map<String, Object> dataMap) throws Exception {
		CommonRequest<Map<String, Object>> request = new CommonRequest<Map<String, Object>>(dataMap);
		return mapAreaTagQuery.queryAllMapAreaByConditions(request);
	}
}

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

@@ -1,12 +1,8 @@
package com.ai.bss.location.rescue.service.impl;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ai.bss.worker.model.EmployeeTerminalRelaDto;
import com.ai.bss.worker.service.api.EmployeeTerminalRelaQuery;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,13 +22,15 @@ import com.ai.bss.user.dto.EmployeeDto;
import com.ai.bss.user.dto.UserDto;
import com.ai.bss.user.service.api.EmployeeService;
import com.ai.bss.user.service.api.UserDtoQuery;
import com.ai.bss.worker.model.EmployeeTerminalRelaDto;
import com.ai.bss.worker.service.api.EmployeeTerminalRelaQuery;
@Service
public class WorkEmployeeServiceImpl implements WorkEmployeeService {
    Logger logger = LoggerFactory.getLogger(WorkEmployeeServiceImpl.class);
    @Autowired
    UserDtoQuery userDtoQuery;
    private UserDtoQuery userDtoQuery;
    @Autowired
    private OrganizationQuery organizationQuery;
@@ -41,10 +39,10 @@ public class WorkEmployeeServiceImpl implements WorkEmployeeService {
    private EmployeeService employeeService;
    @Autowired
    CharacteristicSpecService characteristicSpecService;
    private CharacteristicSpecService characteristicSpecService;
    @Autowired
    EmployeeTerminalRelaQuery employeeTerminalRelaQuery;
    private EmployeeTerminalRelaQuery employeeTerminalRelaQuery;
    @Override
    public CommonResponse<PageBean<UserDto>> queryWorkEmployee(CommonRequest<UserDto> request) throws Exception {

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

@@ -1,8 +1,14 @@
package com.ai.bss.location.rescue.service.interfaces;
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;
/**
 * 报警救援管理
@@ -11,11 +17,65 @@ import com.ai.abc.api.model.CommonResponse;
 */
public interface AlarmManagementService {
    /**
     * 初始化实时报警数据
     * @return
     * @throws Exception
     */
    CommonResponse<Map<String,Object>> loadAlarmDetails() throws Exception;
	/**
	 * 初始化实时报警数据
	 * @return
	 * @throws Exception
	 */
	CommonResponse<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<WorkTaskRescue> assignRescuer(WorkTaskRescue workTaskRescue) throws Exception;
	/**
	 * 关闭救援
	 * 
	 * @param workTaskRescue
	 * @param isFalseAlarm
	 * @return
	 * @throws Exception
	 */
	CommonResponse<WorkTaskRescue> closeRescue(WorkTaskRescue workTaskRescue, String isFalseAlarm) 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 params
	* @return
	* @throws Exception
	*/
	CommonResponse<Void> deleteCloseAlarm(Map<String, String> params) throws Exception;
}

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

@@ -1,11 +1,11 @@
package com.ai.bss.location.rescue.service.interfaces;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageInfo;
import java.util.List;
import java.util.Map;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageInfo;
public interface DeviceManageService {
	/**

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

@@ -1,16 +1,15 @@
package com.ai.bss.location.rescue.service.interfaces;
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.tool.model.ResourceTool;
import com.ai.bss.work.tool.model.ResourceToolType;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public interface EquipmentManageService {
    CommonResponse<PageBean<Map<String, Object>>> queryEquipmentInfo(CommonRequest<HashMap<String, Object>> conditionMap) throws Exception;
@@ -23,5 +22,5 @@ public interface EquipmentManageService {
    CommonResponse<List<ResourceToolType>> loadAllResourceToolType(CommonRequest commonRequest);
    CommonResponse<PageInfo<Map<String, Object>>> queryAllEquipmentNotBind() throws Exception;
    CommonResponse<List<Map<String, Object>>> queryAllEquipmentNotBind(HashMap<String, Object> dataMap) throws Exception;
}

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

@@ -1,8 +1,13 @@
package com.ai.bss.location.rescue.service.interfaces;
import java.util.List;
import java.util.Map;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.location.rescue.model.EbcEntityPosition;
import com.ai.bss.location.rescue.model.EbcMapArea;
import com.ai.bss.position.model.EntityPosition;
import com.ai.bss.position.model.MapArea;
/**
 * 人员定位管理
@@ -11,18 +16,57 @@ import com.ai.abc.api.model.CommonResponse;
 */
public interface LocationManagementService {
    /**
     * 初始化人员定位详细数据
     * @return
     * @throws Exception
     */
    CommonResponse<Map<String,Object>> loadLocationDetails() throws Exception;
    /**
     * 初始化人员定位统计数据
     * @return
     * @throws Exception
     */
    Map<String,Integer> loadEmployeeStatusCount() throws Exception;
	/**
	 * 初始化人员定位详细数据
	 * @return
	 * @throws Exception
	 */
	CommonResponse<Map<String, Object>> loadLocationDetails() throws Exception;
	/**
	 * 初始化人员定位统计数据
	 * @return
	 * @throws Exception
	 */
	Map<String, Integer> loadEmployeeStatusCount() throws Exception;
	/**
	 * 获取人员的轨迹
	 * 
	 * @param requestMap
	 * @param pageNumber
	 * @param pageSize
	 * @return
	 * @throws Exception
	 */
	CommonResponse<Map<String, Object>> queryEmployeeTrace(Map<String, Object> requestMap, int pageNumber, int pageSize)
			throws Exception;
	/**
	 * 获取设备、围栏的状态
	 *
	 * @param mapAreaList
	 * @return
	 * @throws Exception
	 */
	List<EbcMapArea> getMapAreaAllStatus(List<MapArea> mapAreaList) throws Exception;
	/**
	 * 获取人员的状态
	 *
	 * @param EntityPositionList
	 * @return
	 * @throws Exception
	 */
	List<EbcEntityPosition> getEmployeeAllStatus(List<EntityPosition> EntityPositionList, String locationStatus)
			throws Exception;
	/**
	 * 获取单个人员的状态
	 *
	 * @param entityPosition
	 * @return
	 */
	String getEntityPositionStatus(EntityPosition entityPosition);
}

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

@@ -22,13 +22,6 @@ public interface MapTagManageService {
	CommonResponse<PageBean<Map<String, Object>>> queryPageMapTagInfo(Map<String, String> params, int pageNumber, int pageSize) throws Exception;
	/**
	 * 按部门查询所有围栏信息
	 * @return
	 * @throws Exception
	 */
	CommonResponse<List<Map<String, Object>>> queryAllMapTagByOrg(Map<String, String> params) throws Exception;
	/**
	 * 获取单个围栏信息
	 * @param params
	 * @return
@@ -66,4 +59,12 @@ public interface MapTagManageService {
	 */
	CommonResponse<Void> deleteMapTagInfo(List<String> mapTagIdsList) throws Exception;
	/**
	 * 按部门查询所有围栏信息
	 * @param dataMap
	 * @return
	 * @throws Exception
	 */
	CommonResponse<List<Map<String, Object>>> queryAllMapAreaByOrg(Map<String, Object> dataMap) throws Exception;
}

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

@@ -7,14 +7,11 @@ import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.person.model.Individual;
import com.ai.bss.person.model.Organization;
import com.ai.bss.user.dto.EmployeeDto;
import com.ai.bss.user.dto.UserDto;
import com.ai.bss.worker.model.EmployeeTerminalRelaDto;
import java.util.List;
public interface WorkEmployeeService {
	/**

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

@@ -0,0 +1,52 @@
package com.ai.bss.location.rescue.service.task;
import java.util.Map;
import org.apache.commons.collections4.map.HashedMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.location.rescue.util.DateUtil;
import com.ai.bss.work.task.model.common.WorkTask;
import com.ai.bss.worker.service.api.EntityAlarmHandle;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@Component
public class AlarmMirrorTask implements EntityAlarmHandle {
	Logger logger = LoggerFactory.getLogger(AlarmMirrorTask.class);
	/**
	 * 镜屏推送实时报警信息
	 *
	 * @param workTask
	 * @return
	 */
	@Override
	public CommonResponse<Map<String, Object>> alarmHandle(CommonRequest<WorkTask> workTask) {
		logger.debug("实时报警接收镜屏数据: " + JSON.toJSONString(workTask));
		try {
			String charValueSet = workTask.getData().getCharValueSet();
			JSONObject alarmInfJsonObj = JSONObject.parseObject(charValueSet);
			Map<String, String> resultMap = new HashedMap<String, String>();
			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"))));
			String msg = JSON.toJSONString(CommonResponse.ok(resultMap));
			logger.info("实时报警推送镜屏数据: " + msg);
			MirrorManagement.sendData(MirrorManagement.topic_personnel, msg);
		} catch (Exception e) {
			logger.error("实时报警推送镜屏失败: " + e.getMessage());
		}
		return null;
	}
}

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

@@ -0,0 +1,63 @@
package com.ai.bss.location.rescue.service.task;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.location.rescue.service.interfaces.LocationManagementService;
import com.ai.bss.position.model.EntityPosition;
import com.ai.bss.position.model.MapArea;
import com.ai.bss.position.service.api.outparam.LoadMapViewParam;
import com.ai.bss.worker.service.api.EntityPositionChangeHandle;
import com.alibaba.fastjson.JSON;
@Component
public class LocationMirrorTask implements EntityPositionChangeHandle {
	Logger logger = LoggerFactory.getLogger(LocationMirrorTask.class);
	@Autowired
	LocationManagementService locationManagementService;
	/**
	 * 镜屏推送实体位置变动信息
	 *
	 * @param commonRequest
	 * @return
	 */
	@Override
	public CommonResponse<Map<String, Object>> entityPositionChange(CommonRequest<LoadMapViewParam> commonRequest) {
		logger.debug("人员定位接收镜屏数据: " + JSON.toJSONString(commonRequest));
		try {
			Map<String, Object> resultMap = new HashMap<String, Object>();
			if (commonRequest != null && commonRequest.getData() != null) {
				resultMap.put("aggregatedMapAreaList", locationManagementService
						.getMapAreaAllStatus(commonRequest.getData().getAggregatedMapAreaList()));
				resultMap.put("unaggregatedEntityPositionList", locationManagementService
						.getEmployeeAllStatus(commonRequest.getData().getUnaggregatedEntityPositionList(), null));
			} else {
				resultMap.put("aggregatedMapAreaList", new ArrayList<MapArea>());
				resultMap.put("unaggregatedEntityPositionList", new ArrayList<EntityPosition>());
			}
			resultMap.put("countMap", locationManagementService.loadEmployeeStatusCount());
			String msg = JSON.toJSONString(CommonResponse.ok(resultMap));
			logger.info("人员定位推送镜屏数据: " + msg);
			MirrorManagement.sendData(MirrorManagement.topic_personnel, msg);
		} catch (Exception e) {
			logger.error("人员定位推送镜屏失败: " + e.getMessage());
		}
		return null;
	}
}

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

@@ -1,24 +1,20 @@
package com.ai.bss.location.rescue.util;
package com.ai.bss.location.rescue.service.task;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.ai.bss.location.rescue.controller.MapTagManageController;
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;
import com.ai.ipu.server.connect.ps.impl.Publisher;
import com.alibaba.fastjson.JSON;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
 * 镜屏推送消息
 * @author konghl@asiainfo.com
 * 2020-10-21
 */
public class MirrorSendDateUtil {
	private static final Logger logger = LoggerFactory.getLogger(MirrorSendDateUtil.class);
public class MirrorManagement {
	private static final Logger logger = LoggerFactory.getLogger(MirrorManagement.class);
	
	// 人员定位topic
	public static final String topic_personnel = "personnel";

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

@@ -0,0 +1,37 @@
package com.ai.bss.location.rescue.service.task;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.location.rescue.service.impl.AlarmManagementServiceImpl;
import com.ai.bss.location.rescue.util.DateUtil;
import com.ai.bss.position.service.api.EntityPositionCommand;
@Component
public class TimingTask {
	Logger logger = LoggerFactory.getLogger(TimingTask.class);
	@Autowired
	private EntityPositionCommand entityPositionCommand;
	// 超时时间
	@Value("${device.overtime.offline:20}")
	private String overtime;
	@Scheduled(cron = "0 */1 * * * ?")
	public void checkDeviceOvertime() {
		try {
			logger.debug("执行定时任务:" + DateUtil.getSysDateTime());
			CommonRequest<Integer> request = new CommonRequest<Integer>(Integer.valueOf(overtime));
			CommonResponse<Void> result = entityPositionCommand.entityPositionTimeout(request);
		} catch (Exception e) {
			logger.error("定时任务执行失败:" + e.getMessage());
		}
	}
}

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

@@ -200,9 +200,9 @@ public class DateUtil {
	}
	/**
	 * 时间转字符串
	 * 时间转指定格式字符串
	 * @param date
	 * @param pattern 时间格式
	 * @param pattern 输出的时间格式
	 * @return
	 */
	public static String formatDate(Date date, String pattern) {
@@ -213,6 +213,27 @@ public class DateUtil {
		SimpleDateFormat formatter = new SimpleDateFormat(pattern);
		return formatter.format(date);
	}
	
	/**
	 * 时间戳转字符串 
	 * @param date
	 * @return yyyy-MM-dd HH:mm:ss
	 */
	public static String formatDate(long timestamp) {
		return formatDate(timestamp, DateUtil.NORM_DATETIME_PATTERN);
	}
	/**
	 * 时间戳转指定格式字符串
	 * @param date
	 * @param pattern 输出的时间格式
	 * @return
	 */
	public static String formatDate(long timestamp, String pattern) {
		Date date=new Date(timestamp);
		SimpleDateFormat formatter = new SimpleDateFormat(pattern);
		return formatter.format(date);
	}
	/**
	 * 字符串转时间
@@ -232,7 +253,7 @@ public class DateUtil {
	/**
	 * 字符串转时间
	 * @param dateStr
	 * @param pattern 时间格式
	 * @param pattern 字符串时间格式
	 * @return
	 * @throws Exception 
	 */
@@ -366,7 +387,7 @@ public class DateUtil {
	 * @return yyyy-MM-dd HH:mm:ss
	 * @throws Exception
	 */
	public static final String getSysTime() throws Exception {
	public static final String getSysDateTime() throws Exception {
		return getSysDate(NORM_DATETIME_PATTERN);
	}

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

@@ -15,9 +15,6 @@ public class EbcConstant {
	// 轨迹回放单次查询条数
	public static final int TRACK_PLAYBACK_SIZE = 100;
	// 经纬度的精度
	public static final int COORD_SCALE = 7;
	// 终端的名称前缀
	public static final String BEIDOUDEVICE_NAME = "康派北斗 - ";
@@ -36,14 +33,14 @@ public class EbcConstant {
	// 终端和船舶绑定
	public static final String BIND_DEVICE_TYPE_SHIP = "2";
	//静态常量: 设备类型
	//静态常量: 终端类型
	public static final String BUSINESS_SPEC_PRODUCT_TYPE="PRODUCT_TYPE";
	
	//静态常量: 围栏类型
	public static final String BUSINESS_SPEC_MAP_AREA_TYPE="MAP_AREA_TYPE";
	
	//静态常量: 围栏类型
	//静态常量: 职务类型
	public static final String BUSINESS_SPEC_EMPLOYEE_POSITION="mainJobPosition";
	
	//静态常量: 报警类型
	public static final String BUSINESS_SPEC_MAP_AREA_TYPE="ALARM_TYPE";
		
	//工具是否可绑定：不可绑定
	public static final String TOOL_BIND_REJECT="0";
@@ -51,6 +48,25 @@ public class EbcConstant {
	//工具是否可绑定：可绑定
	public static final String TOOL_BIND_ALLOW="1";
	// 轨迹的时间段：10分钟
	public static final String LOCUS_TIME_INTERVAL_TENMINUTE = "1";
	
	// 轨迹的时间段：1小时
	public static final String LOCUS_TIME_INTERVAL_ONEHOUR = "2";
	
	// 轨迹的时间段：1天
	public static final String LOCUS_TIME_INTERVAL_ONEDAY = "3";
	
	// 轨迹的时间段：自定义
	public static final String LOCUS_TIME_INTERVAL_CUSTOM = "4";
	
	// 是否已指派救援者：否
	public static final String IS_ASSIGN_RESCUER_FALSE = "0";
	// 是否已指派救援者：是
	public static final String IS_ASSIGN_RESCUER_TRUE = "1";
	
	
	
	
	
@@ -132,16 +148,6 @@ public class EbcConstant {
	// 考勤查询：月
	public static final String AREA_IN_OUT_RECORD_MONTH = "month";
	// 轨迹的时间段：10分钟
	public static final String locus_time_interval_tenMinute = "1";
	
	// 轨迹的时间段：1小时
	public static final String locus_time_interval_oneHour = "2";
	
	// 轨迹的时间段：1天
	public static final String locus_time_interval_oneDay = "3";
	
	// 轨迹的时间段：自定义
	public static final String locus_time_interval_custom = "4";
	
}

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

@@ -1,15 +1,16 @@
package com.ai.bss.location.rescue.util;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.Map;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
/**
 * 北向接口统一入口

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

@@ -9,3 +9,6 @@ url.iot.login=http://47.105.130.83:8083/sso/login
#iot\u7684\u5317\u5411\u63a5\u53e3\u7edf\u4e00\u5730\u5740
#url.iot.service=http://60.205.219.67:8300/dmp/terminalNorthApi/
url.iot.service=http://47.105.130.83:8083/dmp/terminalNorthApi/
#\u7ec8\u7aef\u8d85\u65f6\u79bb\u7ebf\u65f6\u95f4(\u5206\u949f)
device.overtime.offline=20