终端管理重构

location-rescue-service/pom.xml

@@ -63,6 +63,18 @@
            <version>2.1-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.ai.bss</groupId>
            <artifactId>worker-service</artifactId>
            <version>2.1-SNAPSHOT</version>
        </dependency>
		<dependency>
            <groupId>com.ai.bss</groupId>
            <artifactId>characteristic-spec-service</artifactId>
            <version>2.1-SNAPSHOT</version>
        </dependency>
        
        <!-- <dependency>
            <groupId>com.ai.ipu</groupId>
            <artifactId>ipu-common</artifactId>

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

@@ -8,12 +8,16 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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.bss.characteristic.spec.model.CharacteristicSpecValue;
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 com.ai.bss.user.dto.UserDto;
/**
 * 终端管理
@@ -21,45 +25,42 @@ import com.ai.bss.location.rescue.util.NorthboundInterfaceConstant;
@Controller
@RequestMapping("/device")
public class DeviceManageController {
	Logger logger = LoggerFactory.getLogger(DeviceManageController.class);
	@Autowired
	DeviceManageService deviceManageService;
	/**
	 * 分页查询终端信息
	 *  分页查询终端信息
	 * @param request
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryPageDeviceInfo")
	public Map<String, Object> queryPageDeviceInfo(Map<String, Object> params) throws Exception {
	public Map<String, Object> queryPageDeviceInfo(@RequestBody CommonRequest<Map<String, String>> request)
			throws Exception {
		// 当前页数
		int pageNum = Integer.parseInt(String.valueOf(params.get("pageNum")));
		int pageNumber = request.getPageNumber() < 1 ? 1 : request.getPageNumber();
		// 每页条数
		int pageSize = Integer.parseInt(String.valueOf(params.get("pageSize")));
		int pageSize = request.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE : request.getPageSize();
		Map<String, Object> result = deviceManageService.queryPageDeviceInfo(request.getData(), pageNumber, pageSize);
		Map<String, Object> result = deviceManageService.queryPageDeviceInfo(params, pageNum, pageSize);
		return result;
	}
	/**
	 * 获取下拉列表的终端信息
	 * 
	 * @param params
	 * 获取终端类型下拉列表
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryListDeviceInfo")
	public Map<String, Object> queryListDeviceInfo(Map<String, Object> params) throws Exception {
	@RequestMapping("/queryDeviceTypeList")
	public Map<String, Object> queryDeviceTypeList() {
		Map<String, Object> result = new HashMap<String, Object>();
		List<CharacteristicSpecValue> resultList = deviceManageService.queryDeviceTypeList();
		// 当前页数
		int pageNum = 1;
		// 每页条数
		int pageSize = EbcConstant.comboBox_maxNum;
		List<Map<String, String>> resultList = deviceManageService.queryListDeviceInfo(params, pageNum, pageSize);
		result.put("dataList", resultList);
		return result;
	}
@@ -72,7 +73,7 @@ public class DeviceManageController {
	 */
	@ResponseBody
	@RequestMapping("/queryOneDeviceInfo")
	public Map<String, Object> queryOneDeviceInfo(Map<String, Object> params) throws Exception {
	public Map<String, Object> queryOneDeviceInfo(Map<String, String> params) throws Exception {
		Map<String, Object> result = new HashMap<String, Object>();
		if (params == null || params.get("deviceId") == null) {
@@ -95,7 +96,7 @@ public class DeviceManageController {
	 */
	@ResponseBody
	@RequestMapping("/addDeviceInfo")
	public Map<String, Object> addDeviceInfo(Map<String, Object> params) throws Exception {
	public Map<String, Object> addDeviceInfo(Map<String, String> params) throws Exception {
		Map<String, Object> result = new HashMap<String, Object>();
		if (params == null || params.get("deviceNo") == null) {
@@ -125,7 +126,7 @@ public class DeviceManageController {
	 */
	@ResponseBody
	@RequestMapping("/modifyDeviceInfo")
	public Map<String, Object> modifyDeviceInfo(Map<String, Object> params) throws Exception {
	public Map<String, Object> modifyDeviceInfo(Map<String, String> params) throws Exception {
		Map<String, Object> result = new HashMap<String, Object>();
		if (params == null || params.get("deviceId") == null) {
@@ -155,7 +156,7 @@ public class DeviceManageController {
	 */
	@ResponseBody
	@RequestMapping("/deleteDeviceInfo")
	public Map<String, Object> deleteDeviceInfo(Map<String, Object> params) throws Exception {
	public Map<String, Object> deleteDeviceInfo(Map<String, String> params) throws Exception {
		Map<String, Object> result = new HashMap<String, Object>();
		if (params == null || params.get("deviceId") == null) {
@@ -177,129 +178,158 @@ public class DeviceManageController {
	}
	/**
	 * 关联终端（关联用户或者船舶的保存功能）
	 *
	 * 获取下拉列表的终端信息
	 * 
	 * @param params
	 * @return
	 * @throws Exception
	 */
	/*
	@ResponseBody
	@RequestMapping("/queryListDeviceInfo")
	public Map<String, Object> queryListDeviceInfo(Map<String, Object> params) throws Exception {
	Map<String, Object> result = new HashMap<String, Object>();
	
	// 当前页数
	int pageNum = 1;
	// 每页条数
	int pageSize = EbcConstant.COMBOBOX_MAXNUM;
	
	List<Map<String, String>> resultList = deviceManageService.queryListDeviceInfo(params, pageNum, pageSize);
	result.put("dataList", resultList);
	return result;
	}
	
	*//**
		* 关联终端（关联用户或者船舶的保存功能）
		*
		*/
	/*
	@ResponseBody
	@RequestMapping("/bindDevice")
	public Map<String, Object> bindDevice(Map<String, Object> params) throws Exception {
		Map<String, Object> result = new HashMap<String, Object>(); // 返回值
		if (params.get("DEVICE_ID") != null && !"".equals(params.get("DEVICE_ID"))) {
			boolean flag = false;
			flag = deviceManageService.bindDevice(params);
			result.put("result", flag);
		} else {
			logger.error("关联终端失败:设备id为空");
			result.put("result", false);
			result.put("errMsg", "关联终端失败");
		}
		return result;
	Map<String, Object> result = new HashMap<String, Object>(); // 返回值
	if (params.get("DEVICE_ID") != null && !"".equals(params.get("DEVICE_ID"))) {
		boolean flag = false;
		flag = deviceManageService.bindDevice(params);
		result.put("result", flag);
	} else {
		logger.error("关联终端失败:设备id为空");
		result.put("result", false);
		result.put("errMsg", "关联终端失败");
	}
	/**
	 * 解绑终端
	 */
	return result;
	}
	
	*//**
		* 解绑终端
		*/
	/*
	@ResponseBody
	@RequestMapping("/unbindDevice")
	public Map<String, Object> unbindDevice(Map<String, Object> params) throws Exception {
		Map<String, Object> result = new HashMap<String, Object>(); // 返回值
		boolean flag = false;
		if (params.get("DEVICE_ID") != null && !"".equals(params.get("DEVICE_ID"))) {
			flag = deviceManageService.unbindDevice(params);
		} else {
			logger.error("解绑终端失败:设备id为空");
			result.put("result", false);
			result.put("errMsg", "解绑终端失败");
		}
		result.put("result", flag);
		return result;
	Map<String, Object> result = new HashMap<String, Object>(); // 返回值
	boolean flag = false;
	if (params.get("DEVICE_ID") != null && !"".equals(params.get("DEVICE_ID"))) {
		flag = deviceManageService.unbindDevice(params);
	} else {
		logger.error("解绑终端失败:设备id为空");
		result.put("result", false);
		result.put("errMsg", "解绑终端失败");
	}
	/**
	 * 关联列表信息查询
	 */
	result.put("result", flag);
	return result;
	}
	
	*//**
		* 关联列表信息查询
		*/
	/*
	@ResponseBody
	@RequestMapping("/queryAssociatInfo")
	public Map<String, Object> queryAssociatInfo(Map<String, Object> params) throws Exception {
		List<Map<String, Object>> userList = deviceManageService.queryAssociatInfo(params);
		Map<String, Object> result = new HashMap<String, Object>();
		result.put("result", userList);
		return result;
	List<Map<String, Object>> userList = deviceManageService.queryAssociatInfo(params);
	Map<String, Object> result = new HashMap<String, Object>();
	result.put("result", userList);
	return result;
	}
	/**
	 * 验证用户或者船舶是否有终端关联
	 */
	
	*//**
		* 验证用户或者船舶是否有终端关联
		*/
	/*
	@ResponseBody
	@RequestMapping("/verifyUserOrBoatAssociatInfo")
	public Map<String, Object> verifyUserOrBoatAssociatInfo(Map<String, Object> params) throws Exception {
		Map<String, Object> associatMap = deviceManageService.verifyUserOrBoatAssociatInfo(params);
		Map<String, Object> result = new HashMap<String, Object>();
		result.put("result", associatMap);
		return result;
	Map<String, Object> associatMap = deviceManageService.verifyUserOrBoatAssociatInfo(params);
	Map<String, Object> result = new HashMap<String, Object>();
	result.put("result", associatMap);
	return result;
	}
	/**
	 * 获取当前终端最新定位信息
	 * 
	 * @param params
	 * @return
	 * @throws Exception
	 */
	
	*//**
		* 获取当前终端最新定位信息
		* 
		* @param params
		* @return
		* @throws Exception
		*/
	/*
	@ResponseBody
	@RequestMapping("/queryCurrentDeviceLocationInfo")
	public Map<String, Object> queryCurrentDeviceLocationInfo(Map<String, Object> params) throws Exception {
		Map<String, Object> result = new HashMap<String, Object>();
		List<Map<String, String>> resultList = deviceManageService.queryCurrentDeviceLocationInfo(params);
		result.put("dataList", resultList);
		return result;
	Map<String, Object> result = new HashMap<String, Object>();
	
	List<Map<String, String>> resultList = deviceManageService.queryCurrentDeviceLocationInfo(params);
	result.put("dataList", resultList);
	return result;
	}
	/**
	 * 按时间段获取终端的定位信息(轨迹回放)
	 * 
	 * @param params
	 * @return
	 * @throws Exception
	 */
	
	*//**
		* 按时间段获取终端的定位信息(轨迹回放)
		* 
		* @param params
		* @return
		* @throws Exception
		*/
	/*
	@ResponseBody
	@RequestMapping("/queryOneDeviceLocationInfo")
	public Map<String, Object> queryOneDeviceLocationInfo(Map<String, Object> params) throws Exception {
		Map<String, Object> result = new HashMap<String, Object>();
		if (params == null || params.get("deviceId") == null || params.get("timeType") == null) {
			result.put("result", false);
			result.put("errMsg", "查询失败");
			return result;
		}
		// 当前页数
		// int pageNum = Integer.parseInt(params.get("pageNum") < 1 ? 1 : Integer.parseInt(params.get("pageNum");
		// 每页条数
		// int pageSize = Integer.parseInt(params.get("pageSize") < 1 ? EbcConstant.default_page_size : Integer.parseInt(params.get("pageSize");
		// 当前页数
		int pageNum = Integer.parseInt(String.valueOf(params.get("pageNum")));
		// 每页条数
		int pageSize = Integer.parseInt(String.valueOf(params.get("pageSize")));
		result = deviceManageService.queryOneDeviceLocationInfo(params, pageNum, pageSize);
	Map<String, Object> result = new HashMap<String, Object>();
	
	if (params == null || params.get("deviceId") == null || params.get("timeType") == null) {
		result.put("result", false);
		result.put("errMsg", "查询失败");
		return result;
	}
	/**
	 * 导入终端信息
	 */
	@ResponseBody
	@RequestMapping("/importDeviceInfo")
	public Map<String, Object> importDeviceInfo(Map<String, Object> params) throws Exception {
		boolean flag = false;
		if (Integer.parseInt(String.valueOf(params.get("MAP_TAG_ID"))) != 0) {
			// flag= userManageService.importUserInfo(params);
		}
		Map<String, Object> result = new HashMap<String, Object>();
		result.put("result", flag);
		return result;
	
	// 当前页数
	// int pageNum = Integer.parseInt(params.get("pageNum") < 1 ? 1 : Integer.parseInt(params.get("pageNum");
	// 每页条数
	// int pageSize = Integer.parseInt(params.get("pageSize") < 1 ? EbcConstant.default_page_size : Integer.parseInt(params.get("pageSize");
	
	// 当前页数
	int pageNum = Integer.parseInt(String.valueOf(params.get("pageNum")));
	// 每页条数
	int pageSize = Integer.parseInt(String.valueOf(params.get("pageSize")));
	
	result = deviceManageService.queryOneDeviceLocationInfo(params, pageNum, pageSize);
	return result;
	}
	
	*//**
		* 导入终端信息
		*//*
			@ResponseBody
			@RequestMapping("/importDeviceInfo")
			public Map<String, Object> importDeviceInfo(Map<String, Object> params) throws Exception {
			boolean flag = false;
			if (Integer.parseInt(String.valueOf(params.get("MAP_TAG_ID"))) != 0) {
				// flag= userManageService.importUserInfo(params);
			}
			Map<String, Object> result = new HashMap<String, Object>();
			result.put("result", flag);
			return result;
			}*/
}

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

@@ -58,12 +58,12 @@ public class ReceiveSubscribeController {
		// 经度
		BigDecimal longitudeBigDecimal = detailInfo.getJSONObject("longitude").getBigDecimal("value");
		detailInfoMap.put("longitude",
				longitudeBigDecimal.setScale(EbcConstant.coord_scale, BigDecimal.ROUND_HALF_UP).toString());
				longitudeBigDecimal.setScale(EbcConstant.COORD_SCALE, BigDecimal.ROUND_HALF_UP).toString());
		// 纬度
		BigDecimal latitudeBigDecimal = detailInfo.getJSONObject("latitude").getBigDecimal("value");
		detailInfoMap.put("latitude",
				latitudeBigDecimal.setScale(EbcConstant.coord_scale, BigDecimal.ROUND_HALF_UP).toString());
				latitudeBigDecimal.setScale(EbcConstant.COORD_SCALE, BigDecimal.ROUND_HALF_UP).toString());
		// 解析并推送定位数据
		receiveSubscribeService.receiveIotLocationData(detailInfoMap);
@@ -99,12 +99,12 @@ public class ReceiveSubscribeController {
		// 经度
		BigDecimal longitudeBigDecimal = detailInfo.getJSONObject("longitude").getBigDecimal("value");
		detailInfoMap.put("longitude",
				longitudeBigDecimal.setScale(EbcConstant.coord_scale, BigDecimal.ROUND_HALF_UP).toString());
				longitudeBigDecimal.setScale(EbcConstant.COORD_SCALE, BigDecimal.ROUND_HALF_UP).toString());
		// 纬度
		BigDecimal latitudeBigDecimal = detailInfo.getJSONObject("latitude").getBigDecimal("value");
		detailInfoMap.put("latitude",
				latitudeBigDecimal.setScale(EbcConstant.coord_scale, BigDecimal.ROUND_HALF_UP).toString());
				latitudeBigDecimal.setScale(EbcConstant.COORD_SCALE, BigDecimal.ROUND_HALF_UP).toString());
		// 报警类型
		detailInfoMap.put("alarmType", detailInfo.getJSONObject("alarmType").getIntValue("value"));

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

@@ -54,7 +54,7 @@ public class RescueController {
		// 当前页数
		int pageNum = 1;
		// 每页条数
		int pageSize = EbcConstant.comboBox_maxNum;
		int pageSize = EbcConstant.COMBOBOX_MAXNUM;
		List<Map<String, Object>> resultList = rescueService.queryListRescuerInfo(params, pageNum, pageSize);
		result.put("dataList", resultList);

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

@@ -1,6 +1,5 @@
package com.ai.bss.location.rescue.service.impl;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -11,107 +10,259 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ai.bss.location.rescue.dao.interfaces.AreaInOutRecordDao;
import com.ai.bss.location.rescue.dao.interfaces.DeviceManageDao;
import com.ai.bss.location.rescue.dao.interfaces.RescueDao;
import com.ai.bss.location.rescue.enums.UserEnums;
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.PageInfo;
import com.ai.bss.location.rescue.service.interfaces.DeviceManageService;
import com.ai.bss.location.rescue.util.DateUtil;
import com.ai.bss.location.rescue.util.EbcConstant;
import com.ai.bss.location.rescue.util.NorthboundInterfaceConstant;
import com.ai.bss.location.rescue.util.NorthboundInterfaceUtil;
import com.ai.bss.work.tool.service.api.ResourceToolQuery;
import com.ai.bss.worker.model.EmployeeTerminalRelaDto;
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;
@Service
public class DeviceManageServiceImpl implements DeviceManageService {
	Logger logger = LoggerFactory.getLogger(DeviceManageServiceImpl.class);
	@Autowired
	DeviceManageDao deviceManageDao;
	private EmployeeTerminalRelaQuery employeeTerminalRelaQuery;
	@Autowired
	RescueDao rescueDao;
	private EmployeeTerminalRelaCommand employeeTerminalRelaCommand;
	@Autowired
	AreaInOutRecordDao areaInOutRecordDao;
	ResourceToolQuery resourceToolQuery;
	@Autowired
	CharacteristicSpecService characteristicSpecService;
	@Autowired
	NorthboundInterfaceUtil northboundInterfaceUtil;
	@Override
	public Map<String, Object> queryPageDeviceInfo(Map<String, Object> params, int pageNum, int pageSize)
	public Map<String, Object> queryPageDeviceInfo(Map<String, String> params, int pageNumber, int pageSize)
			throws Exception {
		String isBindDevice = String.valueOf(params.get("IsBindDevice"));// 是否绑定终端
		boolean bindDeviceBoolean = EbcConstant.bind_device_ok.equals(isBindDevice);
		boolean unBindDeviceBoolean = EbcConstant.bind_device_no.equals(isBindDevice);
		// 获取已绑定的终端列表
		List<Map<String, Object>> allBindInfoList = deviceManageDao.queryAllBindShip();
		List<Map<String, Object>> bindUserList = deviceManageDao.queryAllBindUser();
		allBindInfoList.addAll(bindUserList);
		boolean bindDeviceBoolean = EbcConstant.BIND_DEVICE_OK.equals(isBindDevice);
		boolean unBindDeviceBoolean = EbcConstant.BIND_DEVICE_NO.equals(isBindDevice);
		// 查询条件
		Map<String, String> paramsMap = new HashMap<String, String>();
		paramsMap.put("specId", EbcConstant.beidouDevice_product_id); // 所属产品
		paramsMap.put("terminalSN", String.valueOf(params.get("deviceNo"))); // 终端序列号
		Map<String, Object> dataMap = new HashMap<String, Object>();
		dataMap.put("pageNumber", pageNumber);
		dataMap.put("pageSize", pageSize);
		Map<String, Object> paramsMap = new HashMap<String, Object>();
		// 终端编号
		if (null != params.get("deviceNo") &&!"".equals(params.get("deviceNo"))) {
			paramsMap.put("terminalSN", params.get("deviceNo"));
		}
		// 包含或不包含终端ID(用逗号隔开)
		// 终端类型
		if (null == params.get("deviceTypeId") || "".equals(params.get("deviceTypeId"))) {
			List<CharacteristicSpecValue> characteristicSpecValueList = queryDeviceTypeList();
			List<String> specIds = new ArrayList<String>();
			for (CharacteristicSpecValue characteristicSpecValue : characteristicSpecValueList) {
				specIds.add(characteristicSpecValue.getCode());
			}
			paramsMap.put("specId", specIds);
		}else {
			paramsMap.put("specId", params.get("deviceTypeId"));
		}
		// 是否绑定
		List<Map<String, Object>> bindToolInfoList = null;
		List<EmployeeTerminalRelaDto> bindEmployeeInfoList = null;
		if (bindDeviceBoolean || unBindDeviceBoolean) {
			StringBuilder deviceIds = new StringBuilder();
			for (int i = 0; i < allBindInfoList.size(); i++) {
				deviceIds.append(allBindInfoList.get(i).get("DEVICE_ID"));
				if (i < allBindInfoList.size() - 1) {
					deviceIds.append(",");
			// 终端与工具绑定
			CommonResponse<PageInfo<Map<String, Object>>> bindToolInfoCommon = resourceToolQuery
					.queryWorkToolsDevRela(null);
			bindToolInfoList = bindToolInfoCommon.getData().getData();
			// 终端与人员绑定
			CommonResponse<List<EmployeeTerminalRelaDto>> bindEmployeeInfoCommon = employeeTerminalRelaQuery
					.queryIndividualDevRela(null);
			bindEmployeeInfoList = bindEmployeeInfoCommon.getData();
			// 终端ID
			List<String> deviceIds = new ArrayList<String>();
			if (bindToolInfoList != null && !bindToolInfoList.isEmpty()) {
				for (Map<String, Object> bindToolInfoMap : bindToolInfoList) {
					deviceIds.add(String.valueOf(bindToolInfoMap.get("resourceToolId")));
				}
			}
			if (bindEmployeeInfoList != null && !bindEmployeeInfoList.isEmpty()) {
				for (EmployeeTerminalRelaDto bindEmployeeInfoMap : bindEmployeeInfoList) {
					deviceIds.add(bindEmployeeInfoMap.getWorkEmployeeId());
				}
			}
			if (bindDeviceBoolean) {
				// 只查询绑定的终端：包含
				paramsMap.put("resourceIdList", deviceIds.toString());
				paramsMap.put("resourceIdList", deviceIds);
			} else if (unBindDeviceBoolean) {
				// 只查询不绑定的终端：不包含
				paramsMap.put("notIn", deviceIds.toString());
				paramsMap.put("notIn", deviceIds);
			}
		}
		// 查询终端信息列表
		params.put("businessParams", paramsMap);
		Map<String, String> deviceInfoMap = deviceManageDao.queryPageDeviceInfo(paramsMap, pageNum, pageSize);
		List<Map> deviceInfoList = JSON.parseArray(JSON.toJSONString(deviceInfoMap.get("result")), Map.class);
		dataMap.put("businessParams", paramsMap);
		// 调用北向接口
		String url = NorthboundInterfaceConstant.queryPageDevice;
		Map<String, String> deviceInfoListMap = northboundInterfaceUtil.iotPostCallUtil(url, dataMap);
		List<Map> deviceInfoList = JSON.parseArray(JSON.toJSONString(deviceInfoListMap.get("result")), Map.class);
		// 整理返回数据信息
		List<Map> dataList = new ArrayList<Map>();
		List<Map> resultList = new ArrayList<Map>();
		if (deviceInfoList != null && deviceInfoList.size() > 0) {
			for (Map map : deviceInfoList) {
				Map dataMap = new HashMap();
				Map resultMap = new HashMap();
				// 终端编号
				String deviceId = String.valueOf(map.get("resourceId"));
				dataMap.put("deviceId", deviceId);
				dataMap.put("deviceNo", deviceId);
				resultMap.put("deviceId", deviceId);
				resultMap.put("deviceNo", deviceId);
				// 备注
				String remarks = String.valueOf(map.get("remarks"));
				remarks = (remarks == null || "".equals(remarks) || "null".equals(remarks)) ? "无" : remarks;
				dataMap.put("remarks", remarks);
				resultMap.put("remarks", remarks);
				// 绑定信息
				dataMap.put("bindName", "--");
				resultMap.put("bindName", "--");
				if (!unBindDeviceBoolean) {
					for (Map bindDeviceMap : allBindInfoList) {
						if (deviceId.equals(String.valueOf(bindDeviceMap.get("DEVICE_ID")))) {
							dataMap.put("bindName", bindDeviceMap.get("NAME"));
							break;
					if (bindToolInfoList != null) {
						for (Map<String, Object> bindToolInfoMap : bindToolInfoList) {
							if (deviceId.equals(String.valueOf(bindToolInfoMap.get("terminalId")))) {
								resultMap.put("bindCode", bindToolInfoMap.get("resourceToolCode"));
								resultMap.put("bindName", bindToolInfoMap.get("resourceToolName"));
								break;
							}
						}
					}
					if (bindEmployeeInfoList != null) {
						for (EmployeeTerminalRelaDto employeeTerminalRelaDto : bindEmployeeInfoList) {
							if (deviceId.equals(employeeTerminalRelaDto.getTerminalId())) {
								resultMap.put("bindCode", employeeTerminalRelaDto.getCode());
								resultMap.put("bindName", employeeTerminalRelaDto.getName());
								break;
							}
						}
					}
				}
				dataList.add(dataMap);
				resultList.add(resultMap);
			}
		}
		// 返回数据
		Map<String, Object> result = new HashMap<String, Object>();
		result.put("dataNum", deviceInfoListMap.get("totalResultNumber"));
		result.put("dataList", resultList);
		return result;
	}
	public List<CharacteristicSpecValue> queryDeviceTypeList() {
		CharacteristicSpec characteristicSpec = this.characteristicSpecService
				.findBusinessSpecByCharSpecCode(EbcConstant.BUSINESS_SPEC_PRODUCT_TYPE);
		List<CharacteristicSpecValue> resultList = characteristicSpec.getCharacteristicSpecValues();
		return resultList;
	}
	
	@Override
	public Map<String, Object> queryOneDeviceInfo(Map<String, String> params) throws Exception {
		//调用北向接口
		String url = NorthboundInterfaceConstant.queryOneDevice+ params.get("deviceId");
		Map<String, String> deviceInfoMap = northboundInterfaceUtil.iotGetCallUtil(url);
		Map resultMap = JSONObject.parseObject(deviceInfoMap.get("result"), Map.class);
		String remarks = deviceInfoMap.get("remarks") == null ? "" : deviceInfoMap.get("remarks");
		resultMap.put("remarks", remarks);
		return resultMap;
	}
	
	@Override
	public Map<String, String> addDeviceInfo(Map<String, String> params) throws Exception {
		Map<String, Object> paramsMap = new HashMap<String, Object>();
		String deviceId = params.get("deviceNo");
		paramsMap.put("deviceId", deviceId);// 终端id
		paramsMap.put("terminalSN", deviceId); // 终端编号
		paramsMap.put("productId", params.get("deviceTypeId")); // 终端类型
		paramsMap.put("deviceName", EbcConstant.BEIDOUDEVICE_NAME+params.get("deviceTypeName") + deviceId); // 名称
		paramsMap.put("remarks", params.get("remarks")); // 备注
		// 调用北向接口
		String url = NorthboundInterfaceConstant.addDevice;
		Map<String, String> map = northboundInterfaceUtil.iotPostCallUtil(url, paramsMap);
		return map;
	}
	
	@Override
	public Map<String, String> modifyDeviceInfo(Map<String, String> params) throws Exception {
		Map<String, Object> paramsMap = new HashMap<String, Object>();
		String deviceId = params.get("deviceId");
		paramsMap.put("deviceId", deviceId);// 终端id
		paramsMap.put("terminalSN", deviceId); // 终端编号
		paramsMap.put("productId", params.get("deviceTypeId")); // 终端类型
		paramsMap.put("deviceName", EbcConstant.BEIDOUDEVICE_NAME+params.get("deviceTypeName") + deviceId); // 名称
		paramsMap.put("remarks", params.get("remarks")); // 备注
		// 调用北向接口
		String url = NorthboundInterfaceConstant.updateDevice;
		Map<String, String> map = northboundInterfaceUtil.iotPostCallUtil(url, paramsMap);
		return map;
	}
	
	@Override
	public Map<String, String> deleteDeviceInfo(Map<String, String> params) throws Exception {
		// 调用北向接口
				String url = NorthboundInterfaceConstant.deleteDevice + params.get("deviceId");
				Map<String, String> map = northboundInterfaceUtil.iotGetCallUtil(url);
				
				
				// 根据终端id删除终端关联信息
				/*if (NorthboundInterfaceConstant.resultCode_succeed.equals(map.get("resultCode"))) {
					HashMap<String, Object> paramsHashMap = new HashMap<>();
					paramsHashMap.put("DEVICE_ID", params.get("deviceId"));
					int i = unbindDevice(paramsHashMap);
				}*/
				return map;
	}
	
	
	
	
	
	
	
	
	
	/*@Override
	public Map<String, Object> queryPageDeviceInfo(Map<String, Object> params, int pageNum, int pageSize)
			throws Exception {
		String isBindDevice = String.valueOf(params.get("IsBindDevice"));// 是否绑定终端
		boolean bindDeviceBoolean = EbcConstant.bind_device_ok.equals(isBindDevice);
		boolean unBindDeviceBoolean = EbcConstant.bind_device_no.equals(isBindDevice);
	
	
		// 返回数据
		Map<String, Object> result = new HashMap<String, Object>();
		result.put("dataNum", deviceInfoMap.get("totalResultNumber"));
		result.put("dataList", dataList);
		return result;
	}
	
	@Override
	public List<Map<String, String>> queryListDeviceInfo(Map<String, Object> params, int pageNum, int pageSize)
			throws Exception {
@@ -119,10 +270,10 @@ public class DeviceManageServiceImpl implements DeviceManageService {
		Map<String, String> paramsMap = new HashMap<String, String>();
		paramsMap.put("specId", EbcConstant.beidouDevice_product_id); // 所属产品
		paramsMap.put("terminalSN", String.valueOf(params.get("deviceNo"))); // 终端序列号
	
		Map<String, String> deviceInfoMap = deviceManageDao.queryPageDeviceInfo(paramsMap, pageNum, pageSize);
		List<Map> deviceInfoList = JSON.parseArray(JSON.toJSONString(deviceInfoMap.get("result")), Map.class);
	
		// 整理返回数据信息
		List<Map<String, String>> dataList = new ArrayList<Map<String, String>>();
		if (deviceInfoList != null && deviceInfoList.size() > 0) {
@@ -134,30 +285,10 @@ public class DeviceManageServiceImpl implements DeviceManageService {
				dataList.add(dataMap);
			}
		}
	
		return dataList;
	}
	@Override
	public Map<String, Object> queryOneDeviceInfo(Map<String, Object> params) throws Exception {
		return deviceManageDao.queryOneDeviceInfo(params);
	}
	@Override
	public Map<String, String> addDeviceInfo(Map<String, Object> params) throws Exception {
		return deviceManageDao.addDeviceInfo(params);
	}
	@Override
	public Map<String, String> modifyDeviceInfo(Map<String, Object> params) throws Exception {
		return deviceManageDao.modifyDeviceInfo(params);
	}
	@Override
	public Map<String, String> deleteDeviceInfo(Map<String, Object> params) throws Exception {
		return deviceManageDao.deleteDeviceInfo(params);
	}
	
	@Override
	public List<Map<String, Object>> queryAssociatInfo(Map<String, Object> params) throws Exception {
		if (EbcConstant.bind_device_type_user.equals(params.get("type"))) {
@@ -170,7 +301,7 @@ public class DeviceManageServiceImpl implements DeviceManageService {
		}
		return new ArrayList<Map<String, Object>>();
	}
	
	@Override
	public Map<String, Object> verifyUserOrBoatAssociatInfo(Map<String, Object> params) throws Exception {
		// 查询用户与终端关联表，如果有数据返回，无数据返回空
@@ -178,59 +309,59 @@ public class DeviceManageServiceImpl implements DeviceManageService {
				String.valueOf(params.get("PARTY_CODE")));
		return userAndDeviceMap;
	}
	
	@Override
	public boolean bindDevice(Map<String, Object> params) throws Exception {
		int num = deviceManageDao.bindDevice(params, String.valueOf(params.get("type")));
		return num > 0;
	}
	
	@Override
	public boolean unbindDevice(Map<String, Object> params) throws Exception {
		int num = deviceManageDao.unbindDevice(params);
		return num > 0;
	}
	
	@Override
	public List<Map<String, String>> queryCurrentDeviceLocationInfo(Map<String, Object> params) throws Exception {
		// 获取已绑定的终端列表
		List<Map<String, Object>> bindUserDeviceList = deviceManageDao.queryAllBindUser();
	
		if (bindUserDeviceList == null || bindUserDeviceList.isEmpty()) {
			return new ArrayList<Map<String, String>>();
		}
	
		List<String> deviceIdsList = new ArrayList<String>();
		for (int i = 0; i < bindUserDeviceList.size(); i++) {
			deviceIdsList.add(String.valueOf(bindUserDeviceList.get(i).get("DEVICE_ID")));
		}
	
		// 获取终端当前位置信息
		List<Map<String, String>> list = deviceManageDao.queryCurrentDeviceLocationInfo(deviceIdsList);
	
		if (list.isEmpty()) {
			logger.info("未查询到设备位置信息");
			return new ArrayList();
		}
	
		// 查询当前所有未关闭的求救信息
		List<Map<String, Object>> alarmMapList = rescueDao.queryNoCloseRescueLog(null);
	
		// 查询人员所在围栏信息
		List<String> mapTagTypeList = new ArrayList<String>();
		mapTagTypeList.add(EbcConstant.area_type_exclusion);
		mapTagTypeList.add(EbcConstant.area_type_temporariness);
		List<Map<String, Object>> areaViolationMapList = areaInOutRecordDao.getBeforeInAreaInfo(null, mapTagTypeList);
	
		SimpleDateFormat simpleDateFormat = new SimpleDateFormat(DateUtil.NORM_DATETIME_PATTERN);
	
		// 拼接返回数据
		for (Map<String, String> map : list) {
			String deviceId = map.get("deviceId");
			map.put("locationStatus", EbcConstant.location_status_normal);// 定位状态
	
			boolean flag = true;
	
			// 人员名称
			for (Map<String, Object> bindDeviceMap : bindUserDeviceList) {
				if (deviceId.equals(String.valueOf(bindDeviceMap.get("DEVICE_ID")))) {
@@ -239,7 +370,7 @@ public class DeviceManageServiceImpl implements DeviceManageService {
					break;
				}
			}
	
			// 离线信息
			if (map.get("alarmType") != null && EbcConstant.alarm_type_offline_beidou == Integer
					.parseInt(String.valueOf(map.get("alarmType")))) {
@@ -247,23 +378,23 @@ public class DeviceManageServiceImpl implements DeviceManageService {
				map.put("alarmType", EbcConstant.alarm_type_offline_ZH);// 报警类型
				flag = false;
			}
	
			// 求救信息
			if (flag && alarmMapList != null && !alarmMapList.isEmpty()) {
				for (int i = 0; i < alarmMapList.size() && flag; i++) {
					Map<String, Object> alarmMap = alarmMapList.get(i);
	
					// 判断是救援者还是求救者
					if (deviceId.equals(String.valueOf(alarmMap.get("DEVICE_ID")))) {
						// 求救者
						// 求救时间
						String alarmDate = String.valueOf(alarmMap.get("CALLER_DATE"));
						map.put("alarmDate", DateUtil.formatStrDate(alarmDate));
	
						// 计算求救时长
						int alarmLong = DateUtil.getDifferenceMinute(alarmDate, map.get("newDate"));
						map.put("alarmLong", String.valueOf(alarmLong));
	
						if (alarmMap.get("RESCUERS_ID") == null) {
							// 未指派救援人员
							map.put("isNewAlarm", EbcConstant.alarm_status_needassign);
@@ -272,10 +403,10 @@ public class DeviceManageServiceImpl implements DeviceManageService {
							map.put("isNewAlarm", EbcConstant.alarm_status_needclose);
							// map.put("rescuerDeviceId", String.valueOf(alarmMap.get("RESCUER_DEVICE_ID")));//救援者的设备ID
						}
	
						// 求救记录ID
						map.put("alarmLogId", String.valueOf(alarmMap.get("LOG_ID")));
	
						// 定位状态
						switch (String.valueOf(alarmMap.get("ALARM_TYPE"))) {
						case EbcConstant.alarm_type_autosos_ZH:
@@ -291,9 +422,9 @@ public class DeviceManageServiceImpl implements DeviceManageService {
						default:
							break;
						}
	
						flag = false;
	
					} else if (deviceId.equals(String.valueOf(alarmMap.get("RESCUER_DEVICE_ID")))) {
						// 救援者
						map.put("locationStatus", EbcConstant.location_status_rescuer);// 定位状态
@@ -302,13 +433,13 @@ public class DeviceManageServiceImpl implements DeviceManageService {
					}
				}
			}
	
			// 违规信息
			if (flag && areaViolationMapList != null && !areaViolationMapList.isEmpty()) {
				int maxMapTagGrade = 0; // 围栏优先级(电子围栏5>定点3>考勤1、作业1)
				long minInAreaLong = System.currentTimeMillis();// 进入围栏最早的时间戳
				Map<String, Object> areaInfoMap = null;// 用于计算时间的围栏信息
	
				for (int i = 0; i < areaViolationMapList.size(); i++) {
					Map<String, Object> areaViolationMap = areaViolationMapList.get(i);
					if (deviceId.equals(String.valueOf(areaViolationMap.get("DEVICE_ID")))) {
@@ -322,7 +453,7 @@ public class DeviceManageServiceImpl implements DeviceManageService {
							mapTagGrade = 3;
							break;
						}
	
						if (mapTagGrade == maxMapTagGrade) {
							// 比较进入时长时间
							long inAreaLong = simpleDateFormat.parse(String.valueOf(areaViolationMap.get("IN_DATE")))
@@ -339,23 +470,23 @@ public class DeviceManageServiceImpl implements DeviceManageService {
						}
					}
				}
	
				// 判断是否违规
				if (maxMapTagGrade == 5) {
					// 进入电子围栏(禁区)，需显示进入时间
					map.put("inDate", simpleDateFormat.format(areaInfoMap.get("IN_DATE"))); // 进入时间
					map.put("locationStatus", EbcConstant.location_status_exclusion); // 定位状态
	
				} else if (maxMapTagGrade == 3) {
					// 进入定点(限时)，需计算是否超时
					int fixedLong = DateUtil.getDifferenceMinute(String.valueOf(areaInfoMap.get("IN_DATE")),
							map.get("newDate"));
	
					if (fixedLong > 0) {
						// 围栏要求定点时间
						int residenceTimeLength = Integer
								.parseInt(String.valueOf(areaInfoMap.get("RESIDENCE_TIME_LENGTH")));
	
						if (residenceTimeLength <= fixedLong) {
							// 已超时
							map.put("locationStatus", EbcConstant.location_status_overtime);// 定位状态
@@ -365,14 +496,14 @@ public class DeviceManageServiceImpl implements DeviceManageService {
				}
			}
		}
	
		return list;
	}
	
	@Override
	public Map<String, Object> queryOneDeviceLocationInfo(Map<String, Object> params, int pageNum, int pageSize)
			throws Exception {
		/*Map<String,Object> resultMap<String,Object> = new HashMap<String,Object>();
		Map<String,Object> resultMap<String,Object> = new HashMap<String,Object>();
		String beginTime = null;// 开始时间
		String endTime = null;// 结束时间
		
@@ -415,8 +546,8 @@ public class DeviceManageServiceImpl implements DeviceManageService {
		paramsMap.put("endTime", endTime);
		
		resultMap<String,Object> = deviceManageDao.queryOneDeviceLocationInfo(paramsMap, pageNum, pageSize);
		return resultMap<String,Object>;*/
		return resultMap<String,Object>;
		return null;
	}
	}*/
}

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

@@ -4,10 +4,11 @@ package com.ai.bss.location.rescue.service.impl;
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.dao.interfaces.DeviceManageDao;
import com.ai.bss.location.rescue.dao.interfaces.EquipmentManageDao;
import com.ai.bss.location.rescue.service.interfaces.EquipmentManageService;
import static org.junit.Assert.assertNotNull;
import java.util.*;
import com.ai.bss.work.tool.model.ResourceTool;
@@ -29,9 +30,6 @@ public class EquipmentManageServiceImpl implements EquipmentManageService {
	EquipmentManageDao equipmentManageDao;
	@Autowired
	DeviceManageDao deviceManageDao;
	@Autowired
	ResourceToolCommand resourceToolCommand;
	@Autowired
@@ -85,8 +83,9 @@ public class EquipmentManageServiceImpl implements EquipmentManageService {
		List<Map<String, Object>> allEquipmentList = equipmentManageDao.queryAllEquipmentInfo(params);
		// 获取已绑定船舶的信息
		List<Map<String, Object>> bindInfoList = deviceManageDao.queryAllBindShip();
		//List<Map<String, Object>> bindInfoList = deviceManageDao.queryAllBindShip();
		List<Map<String, Object>> bindInfoList = null;
		
		if (bindInfoList == null || bindInfoList.isEmpty()) {
			return allEquipmentList;
		}
@@ -96,9 +95,11 @@ public class EquipmentManageServiceImpl implements EquipmentManageService {
		for (Map<String, Object> bindInfoMap : bindInfoList) {
			deviceIdsList.add(String.valueOf(bindInfoMap.get("DEVICE_ID")));
		}
		List<Map<String, String>> deviceLocationInfoList = deviceManageDao
				.queryCurrentDeviceLocationInfo(deviceIdsList);
		//List<Map<String, String>> deviceLocationInfoList = deviceManageDao
		//		.queryCurrentDeviceLocationInfo(deviceIdsList);
		List<Map<String, String>> deviceLocationInfoList = null;
		
		
		// 拼接船舶最新的位置信息
		for (Map<String, Object> bindInfoMap : bindInfoList) {
			String code = String.valueOf(bindInfoMap.get("CODE"));

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

@@ -10,7 +10,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ai.bss.location.rescue.dao.interfaces.DeviceManageDao;
import com.ai.bss.location.rescue.dao.interfaces.MapTagManageDao;
import com.ai.bss.location.rescue.service.interfaces.ReceiveSubscribeService;
import com.ai.bss.location.rescue.service.iotdata.ManageIotInAreaData;
@@ -41,9 +40,6 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
	@Autowired
	MapTagManageDao mapTagManageDao;
	@Autowired
	DeviceManageDao deviceManageDao;
	private ExecutorService cachedThreadPool = Executors.newCachedThreadPool();
	@Override
@@ -102,9 +98,9 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
	 */
	private void executeReceiveIotLocationData(Map<String, Object> params) throws Exception {
		// 获取人员信息
		Map<String, Object> bindInfoMap = deviceManageDao.queryOneBindUser(String.valueOf(params.get("deviceId")),
				null);
		//Map<String, Object> bindInfoMap = deviceManageDao.queryOneBindUser(String.valueOf(params.get("deviceId")),null);
		Map<String, Object> bindInfoMap = null;
				
		if (bindInfoMap == null) {
			// 1、设备与工具(船)绑定
			manageIotToolData.executeReceiveIotData(params);
@@ -144,9 +140,9 @@ public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
	 */
	private void executeReceiveIotAlarmData(Map<String, Object> params) throws Exception {
		// 获取人员信息
		Map<String, Object> bindInfoMap = deviceManageDao.queryOneBindUser(String.valueOf(params.get("deviceId")),
				null);
		//Map<String, Object> bindInfoMap = deviceManageDao.queryOneBindUser(String.valueOf(params.get("deviceId")),null);
		Map<String, Object> bindInfoMap =null;
		
		if (bindInfoMap == null) {
			// 设备未与人员绑定
			logger.error("定位设备未与人员绑定");

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

@@ -1,21 +1,20 @@
package com.ai.bss.location.rescue.service.impl;
import com.ai.bss.location.rescue.dao.interfaces.DeviceManageDao;
import com.ai.bss.location.rescue.dao.interfaces.RescueDao;
import com.ai.bss.location.rescue.service.interfaces.RescueService;
import com.ai.bss.location.rescue.util.DateUtil;
import com.ai.bss.location.rescue.util.EbcConstant;
import java.util.ArrayList;
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 java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ai.bss.location.rescue.dao.interfaces.RescueDao;
import com.ai.bss.location.rescue.service.interfaces.RescueService;
import com.ai.bss.location.rescue.util.DateUtil;
import com.ai.bss.location.rescue.util.EbcConstant;
@Service
public class RescueServiceImpl implements RescueService {
@@ -24,8 +23,6 @@ public class RescueServiceImpl implements RescueService {
	@Autowired
	RescueDao rescueDao;
	@Autowired
	DeviceManageDao deviceManageDao;
	@Override
	public List<Map<String, Object>> queryListRescuerInfo(Map<String,Object> params, int pageNum, int pageSize) throws Exception {
@@ -81,8 +78,10 @@ public class RescueServiceImpl implements RescueService {
		}
		// 获取终端当前位置信息
		List<Map<String, String>> deviceList = deviceManageDao.queryCurrentDeviceLocationInfo(deviceIdsList);
		//List<Map<String, String>> deviceList = deviceManageDao.queryCurrentDeviceLocationInfo(deviceIdsList);
		List<Map<String, String>> deviceList =null;
		
		
		if (deviceList.isEmpty()) {
			logger.info("未查询到设备位置信息");
			return new ArrayList();

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

@@ -3,104 +3,140 @@ package com.ai.bss.location.rescue.service.interfaces;
import java.util.List;
import java.util.Map;
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
public interface DeviceManageService {
	/**
	 * 分页查询终端信息
	 * @param params
	 * @param pageNum 当前页数
	 * @param pageNumber 当前页数
	 * @param pageSize 每页条数
	 * @return
	 * @throws Exception
	 */
	Map<String, Object> queryPageDeviceInfo(Map<String, Object> params, int pageNum, int pageSize) throws Exception;
	Map<String, Object> queryPageDeviceInfo(Map<String, String> params, int pageNumber, int pageSize) throws Exception;
	/**
	 * 获取下拉列表的终端信息
	 * @param params
	 * @param pageNum 当前页数
	 * @param pageSize 每页条数
	 * 获取终端类型下拉列表
	 * @return
	 * @throws Exception
	 */
	List<Map<String, String>> queryListDeviceInfo(Map<String, Object> params, int pageNum, int pageSize)
			throws Exception;
	/**
	 * 获取单个终端信息
	 * @param params
	 * @return
	 * @throws Exception
	 */
	Map<String, Object> queryOneDeviceInfo(Map<String, Object> params) throws Exception;
	List<CharacteristicSpecValue> queryDeviceTypeList();
	
	/**
	 * 新增终端信息
	 * @param params
	 * @return
	 * @throws Exception
	 */
	Map<String, String> addDeviceInfo(Map<String, Object> params) throws Exception;
	* 获取单个终端信息
	* @param params
	* @return
	* @throws Exception
	*/
	/**
	 * 修改终端信息
	 * @param params
	 * @return
	 * @throws Exception
	 */
	Map<String, String> modifyDeviceInfo(Map<String, Object> params) throws Exception;
Map<String, Object> queryOneDeviceInfo(Map<String, String> params) throws Exception;
	/**
	 * 删除终端信息
	 * @param params
	 * @return
	 * @throws Exception
	 */
	Map<String, String> deleteDeviceInfo(Map<String, Object> params) throws Exception;
/**
	* 新增终端信息
	* @param params
	* @return
	* @throws Exception
	*/
	/**
	 * 绑定终端
	 * @param params
	 * @param type
	 * @return
	 * @throws Exception
	 */
	boolean bindDevice(Map<String, Object> params) throws Exception;
Map<String, String> addDeviceInfo(Map<String, String> params) throws Exception;
	/**
	 * 解绑终端
	 * @param params
	 * @return
	 * @throws Exception
	 */
	boolean unbindDevice(Map<String, Object> params) throws Exception;
/**
	* 修改终端信息
	* @param params
	* @return
	* @throws Exception
	*/
	/**
	 * 获取人员或船舶的下拉列表数据
	 * @param params
	 * @return
	 * @throws Exception
	 */
	List<Map<String, Object>> queryAssociatInfo(Map<String, Object> params) throws Exception;
Map<String, String> modifyDeviceInfo(Map<String, String> params) throws Exception;
	Map<String, Object> verifyUserOrBoatAssociatInfo(Map<String, Object> params) throws Exception;
/**
	* 删除终端信息
	* @param params
	* @return
	* @throws Exception
	*/
Map<String, String> deleteDeviceInfo(Map<String, String> params) throws Exception;
	/**
	 * 获取终端的最新事件
	 * @param params
	 * @return
	 * @throws Exception
	 */
	List<Map<String, String>> queryCurrentDeviceLocationInfo(Map<String, Object> params) throws Exception;
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	/**
	 * 按时间段获取终端的定位信息
	 * 获取下拉列表的终端信息
	 * @param params
	 * @param pageNum 当前页数
	 * @param pageSize 每页条数
	 * @return
	 * @throws Exception
	 */
	Map<String, Object> queryOneDeviceLocationInfo(Map<String, Object> params, int pageNum, int pageSize)
	/*List<Map<String, String>> queryListDeviceInfo(Map<String, Object> params, int pageNum, int pageSize)
			throws Exception;
	
	*//**
		* 绑定终端
		* @param params
		* @param type
		* @return
		* @throws Exception
		*/
	/*
	boolean bindDevice(Map<String, Object> params) throws Exception;
	
	*//**
		* 解绑终端
		* @param params
		* @return
		* @throws Exception
		*/
	/*
	boolean unbindDevice(Map<String, Object> params) throws Exception;
	
	*//**
		* 获取人员或船舶的下拉列表数据
		* @param params
		* @return
		* @throws Exception
		*/
	/*
	List<Map<String, Object>> queryAssociatInfo(Map<String, Object> params) throws Exception;
	
	Map<String, Object> verifyUserOrBoatAssociatInfo(Map<String, Object> params) throws Exception;
	
	*//**
		* 获取终端的最新事件
		* @param params
		* @return
		* @throws Exception
		*/
	/*
	List<Map<String, String>> queryCurrentDeviceLocationInfo(Map<String, Object> params) throws Exception;
	
	*//**
		* 按时间段获取终端的定位信息
		* @param params
		* @param pageNum 当前页数
		* @param pageSize 每页条数
		* @return
		* @throws Exception
		*//*
			Map<String, Object> queryOneDeviceLocationInfo(Map<String, Object> params, int pageNum, int pageSize)
				throws Exception;*/
}

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

@@ -5,22 +5,19 @@ 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.bss.location.rescue.dao.interfaces.DeviceManageDao;
import com.ai.bss.location.rescue.util.MirrorSendDateUtil;
@Component
public class ManageIotToolData {
	private static final Logger logger = LoggerFactory.getLogger(ManageIotToolData.class);
	@Autowired
	DeviceManageDao deviceManageDao;
	public boolean executeReceiveIotData(Map<String,Object> params) throws Exception {
		Map<String, Object> bindInfoMap = deviceManageDao.queryOneBindShip(String.valueOf(params.get("deviceId")), null);
		//Map<String, Object> bindInfoMap = deviceManageDao.queryOneBindShip(String.valueOf(params.get("deviceId")), null);
		Map<String, Object> bindInfoMap = null;
				
		if (bindInfoMap == null) {
			// 设备未绑定
			logger.error("定位设备未绑定");

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

@@ -7,38 +7,51 @@ package com.ai.bss.location.rescue.util;
 */
public class EbcConstant {
	// 下拉列表最大查询条数
	public static final int comboBox_maxNum = 20;
	public static final int COMBOBOX_MAXNUM = 30;
	// 每页默认查询条数
	public static final int default_page_size = 20;
	public static final int DEFAULT_PAGE_SIZE = 20;
	
	// 轨迹回放单次查询条数
	public static final int track_playback_size = 100;
	public static final int TRACK_PLAYBACK_SIZE = 100;
	// 经纬度的精度
	public static final int coord_scale = 7;
	// 终端的产品id
	public static final String beidouDevice_product_id = "57700004344";
	public static final int COORD_SCALE = 7;
	// 终端的名称前缀
	public static final String beidouDevice_name = "康派北斗定位器";
	public static final String BEIDOUDEVICE_NAME = "康派北斗 - ";
	// 全部终端(已关联和未关联)
	public static final String bind_device_all = "0";
	public static final String BIND_DEVICE_ALL = "0";
	// 已关联终端
	public static final String bind_device_ok = "1";
	public static final String BIND_DEVICE_OK = "1";
	// 未关联终端
	public static final String bind_device_no = "2";
	public static final String BIND_DEVICE_NO = "2";
	// 终端和人员绑定
	public static final String bind_device_type_user = "1";
	public static final String BIND_DEVICE_TYPE_USER = "1";
	// 终端和船舶绑定
	public static final String bind_device_type_ship = "2";
	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 area_type_attendance = "1";