终端管理重构

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

@@ -44,7 +44,9 @@ public class DeviceManageController {
		// 每页条数
		int pageSize = request.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE : request.getPageSize();
		Map<String, Object> result = deviceManageService.queryPageDeviceInfo(request.getData(), pageNumber, pageSize);
		Map<String, String> params = request.getData() == null ? new HashMap<String, String>() : request.getData();
		Map<String, Object> result = deviceManageService.queryPageDeviceInfo(params, pageNumber, pageSize);
		return result;
	}
@@ -73,10 +75,10 @@ public class DeviceManageController {
	 */
	@ResponseBody
	@RequestMapping("/queryOneDeviceInfo")
	public Map<String, Object> queryOneDeviceInfo(Map<String, String> params) throws Exception {
	public Map<String, Object> queryOneDeviceInfo(@RequestBody Map<String, String> params) throws Exception {
		Map<String, Object> result = new HashMap<String, Object>();
		if (params == null || params.get("deviceId") == null) {
		if (params == null || params.get("deviceId") == null||"".equals(params.get("deviceId"))) {
			result.put("result", false);
			result.put("errMsg", "操作失败");
			return result;
@@ -84,6 +86,7 @@ public class DeviceManageController {
		Map<String, Object> resultMap = deviceManageService.queryOneDeviceInfo(params);
		result.put("resultData", resultMap);
		result.put("result", true);
		return result;
	}
@@ -96,18 +99,18 @@ public class DeviceManageController {
	 */
	@ResponseBody
	@RequestMapping("/addDeviceInfo")
	public Map<String, Object> addDeviceInfo(Map<String, String> params) throws Exception {
	public Map<String, Object> addDeviceInfo(@RequestBody Map<String, String> params) throws Exception {
		Map<String, Object> result = new HashMap<String, Object>();
		if (params == null || params.get("deviceNo") == null) {
		if (params == null || params.get("deviceNo") == null||"".equals(params.get("deviceId"))) {
			result.put("result", false);
			result.put("errMsg", "添加失败");
			return result;
		}
		Map<String, String> resultMap = deviceManageService.addDeviceInfo(params);
		Map<String, Object> resultMap = deviceManageService.addDeviceInfo(params);
		if (NorthboundInterfaceConstant.resultCode_succeed.equals(resultMap.get("resultCode"))) {
		if (NorthboundInterfaceConstant.resultCode_succeed.equals(String.valueOf(resultMap.get("resultCode")))) {
			result.put("result", true);
		} else {
			result.put("result", false);
@@ -126,18 +129,18 @@ public class DeviceManageController {
	 */
	@ResponseBody
	@RequestMapping("/modifyDeviceInfo")
	public Map<String, Object> modifyDeviceInfo(Map<String, String> params) throws Exception {
	public Map<String, Object> modifyDeviceInfo(@RequestBody Map<String, String> params) throws Exception {
		Map<String, Object> result = new HashMap<String, Object>();
		if (params == null || params.get("deviceId") == null) {
		if (params == null || params.get("deviceId") == null||"".equals(params.get("deviceId"))) {
			result.put("result", false);
			result.put("errMsg", "修改失败");
			return result;
		}
		Map<String, String> resultMap = deviceManageService.modifyDeviceInfo(params);
		Map<String, Object> resultMap = deviceManageService.modifyDeviceInfo(params);
		if (NorthboundInterfaceConstant.resultCode_succeed.equals(resultMap.get("resultCode"))) {
		if (NorthboundInterfaceConstant.resultCode_succeed.equals(String.valueOf(resultMap.get("resultCode")))) {
			result.put("result", true);
		} else {
			result.put("result", false);
@@ -156,18 +159,19 @@ public class DeviceManageController {
	 */
	@ResponseBody
	@RequestMapping("/deleteDeviceInfo")
	public Map<String, Object> deleteDeviceInfo(Map<String, String> params) throws Exception {
	public Map<String, Object> deleteDeviceInfo(@RequestBody Map<String, String> params) throws Exception {
		Map<String, Object> result = new HashMap<String, Object>();
		if (params == null || params.get("deviceId") == null) {
		if (params == null || params.get("deviceId") == null||"".equals(params.get("deviceId"))) {
			result.put("result", false);
			result.put("errMsg", "删除失败");
			return result;
		}
		Map<String, String> resultMap = deviceManageService.deleteDeviceInfo(params);
		Map<String, Object> resultMap = deviceManageService.deleteDeviceInfo(params);
		if (NorthboundInterfaceConstant.resultCode_succeed.equals(resultMap.get("resultCode"))) {
		if (resultMap != null
				&& NorthboundInterfaceConstant.resultCode_succeed.equals(String.valueOf(resultMap.get("resultCode")))) {
			result.put("result", true);
		} else {
			result.put("result", false);
@@ -178,79 +182,124 @@ 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;
	@RequestMapping("/queryBindDeviceInfo")
	public Map<String, Object> queryBindDeviceInfo(@RequestBody Map<String, String> params) throws Exception {
		Map<String, Object> result = new HashMap<String, Object>();
		if (params == null || params.get("deviceId") == null||"".equals(params.get("deviceId"))) {
			result.put("result", false);
			result.put("errMsg", "获取绑定关系失败");
			return result;
		}
		Map<String, Object> resultMap  = deviceManageService.queryBindDeviceInfo(params);
		result.put("resultData", resultMap);
		result.put("result", true);
		return result;
	}
	
	List<Map<String, String>> resultList = deviceManageService.queryListDeviceInfo(params, pageNum, pageSize);
	result.put("dataList", resultList);
	return result;
	/**
	 *  关联列表信息查询
	 * @param params
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryAssociatInfo")
	public Map<String, Object> queryAssociatInfo(@RequestBody Map<String, String> 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;
	}
	
	*//**
		* 关联终端（关联用户或者船舶的保存功能）
		*
		*/
	/*
	/**
	 * 关联终端（关联用户或者船舶的保存功能）
	 * @param params
	 * @return
	 * @throws Exception
	 */
	@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;
	public Map<String, Object> bindDevice(@RequestBody Map<String, String> params) throws Exception {
		Map<String, Object> result = new HashMap<String, Object>();
		if (params == null || params.get("deviceId") == null||"".equals(params.get("deviceId"))) {
			result.put("result", false);
			result.put("errMsg", "关联终端失败");
			return result;
		}
		boolean resultFlag = deviceManageService.bindDevice(params);
		if (resultFlag) {
			result.put("result", true);
		} else {
			result.put("result", false);
			result.put("errMsg", "关联终端失败");
		}
		return result;
	}
	
	*//**
		* 解绑终端
		*/
	/*
	/**
	 * 解绑终端
	 * @param params
	 * @return
	 * @throws Exception
	 */
	@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;
	public Map<String, Object> unbindDevice(@RequestBody Map<String, String> params) throws Exception {
		Map<String, Object> result = new HashMap<String, Object>();
		if (params == null || params.get("deviceId") == null||"".equals(params.get("deviceId"))) {
			result.put("result", false);
			result.put("errMsg", "关联终端失败");
			return result;
		}
		boolean resultFlag = deviceManageService.unbindDevice(params);
		if (resultFlag) {
			result.put("result", true);
		} else {
			result.put("result", false);
			result.put("errMsg", "关联终端失败");
		}
		return result;
	}
	
	*//**
		* 关联列表信息查询
		*/
	/**
	 * 获取下拉列表的终端信息
	 * 
	 * @param params
	 * @return
	 * @throws Exception
	 */
	/*
	@ResponseBody
	@RequestMapping("/queryAssociatInfo")
	public Map<String, Object> queryAssociatInfo(Map<String, Object> params) throws Exception {
	List<Map<String, Object>> userList = deviceManageService.queryAssociatInfo(params);
	@RequestMapping("/queryListDeviceInfo")
	public Map<String, Object> queryListDeviceInfo(Map<String, Object> params) throws Exception {
	Map<String, Object> result = new HashMap<String, Object>();
	result.put("result", userList);
	
	// 当前页数
	int pageNum = 1;
	// 每页条数
	int pageSize = EbcConstant.COMBOBOX_MAXNUM;
	
	List<Map<String, String>> resultList = deviceManageService.queryListDeviceInfo(params, pageNum, pageSize);
	result.put("dataList", resultList);
	return result;
	}
	

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

@@ -10,6 +10,7 @@ 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;
@@ -19,13 +20,18 @@ 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.location.rescue.util.NorthboundInterfaceUtil;
import com.ai.bss.work.tool.model.ResourceToolTerminalRel;
import com.ai.bss.work.tool.service.api.ResourceToolCommand;
import com.ai.bss.work.tool.service.api.ResourceToolQuery;
import com.ai.bss.worker.model.EmployeeTerminalRela;
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;
import antlr.debug.NewLineEvent;
@Service
public class DeviceManageServiceImpl implements DeviceManageService {
	Logger logger = LoggerFactory.getLogger(DeviceManageServiceImpl.class);
@@ -45,6 +51,9 @@ public class DeviceManageServiceImpl implements DeviceManageService {
	@Autowired
	NorthboundInterfaceUtil northboundInterfaceUtil;
	@Autowired
	ResourceToolCommand resourceToolCommand;
	@Override
	public Map<String, Object> queryPageDeviceInfo(Map<String, String> params, int pageNumber, int pageSize)
			throws Exception {
@@ -59,19 +68,19 @@ public class DeviceManageServiceImpl implements DeviceManageService {
		Map<String, Object> paramsMap = new HashMap<String, Object>();
		// 终端编号
		if (null != params.get("deviceNo") &&!"".equals(params.get("deviceNo"))) {
		if (null != params.get("deviceNo") && !"".equals(params.get("deviceNo"))) {
			paramsMap.put("terminalSN", params.get("deviceNo"));
		}
		// 终端类型
		List<CharacteristicSpecValue> characteristicSpecValueList = queryDeviceTypeList();
		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 {
		} else {
			paramsMap.put("specId", params.get("deviceTypeId"));
		}
@@ -114,38 +123,50 @@ public class DeviceManageServiceImpl implements DeviceManageService {
		// 调用北向接口
		String url = NorthboundInterfaceConstant.queryPageDevice;
		Map<String, String> deviceInfoListMap = northboundInterfaceUtil.iotPostCallUtil(url, dataMap);
		Map<String, Object> deviceInfoListMap = northboundInterfaceUtil.iotPostCallUtil(url, dataMap);
		List<Map> deviceInfoList = JSON.parseArray(JSON.toJSONString(deviceInfoListMap.get("result")), Map.class);
		// 整理返回数据信息
		List<Map> resultList = new ArrayList<Map>();
		if (deviceInfoList != null && deviceInfoList.size() > 0) {
			for (Map map : deviceInfoList) {
			for (Map deviceInfoMap : deviceInfoList) {
				Map resultMap = new HashMap();
				// 终端编号
				String deviceId = String.valueOf(map.get("resourceId"));
				String deviceId = String.valueOf(deviceInfoMap.get("resourceId"));
				resultMap.put("deviceId", deviceId);
				resultMap.put("deviceNo", deviceId);
				// 备注
				String remarks = String.valueOf(map.get("remarks"));
				String remarks = String.valueOf(deviceInfoMap.get("remarks"));
				remarks = (remarks == null || "".equals(remarks) || "null".equals(remarks)) ? "无" : remarks;
				resultMap.put("remarks", remarks);
				// 终端类型
				String deviceType = String.valueOf(deviceInfoMap.get("specId"));
				for (CharacteristicSpecValue characteristicSpecValue : characteristicSpecValueList) {
					if (deviceType.equals(characteristicSpecValue.getCode())) {
						resultMap.put("deviceTypeId", deviceType);
						resultMap.put("deviceTypeName", characteristicSpecValue.getValue());
						break;
					}
				}
				// 绑定信息
				resultMap.put("bindName", "--");
				boolean bindFlag = true;
				if (!unBindDeviceBoolean) {
					if (bindToolInfoList != null) {
						for (Map<String, Object> bindToolInfoMap : bindToolInfoList) {
						for (int i = 0; i < bindToolInfoList.size() && bindFlag; i++) {
							Map<String, Object> bindToolInfoMap = bindToolInfoList.get(i);
							if (deviceId.equals(String.valueOf(bindToolInfoMap.get("terminalId")))) {
								resultMap.put("bindCode", bindToolInfoMap.get("resourceToolCode"));
								resultMap.put("bindName", bindToolInfoMap.get("resourceToolName"));
								break;
								bindFlag = false;
							}
						}
					}
					if (bindEmployeeInfoList != null) {
					if (bindEmployeeInfoList != null && bindFlag) {
						for (EmployeeTerminalRelaDto employeeTerminalRelaDto : bindEmployeeInfoList) {
							if (deviceId.equals(employeeTerminalRelaDto.getTerminalId())) {
								resultMap.put("bindCode", employeeTerminalRelaDto.getCode());
@@ -168,86 +189,180 @@ public class DeviceManageServiceImpl implements DeviceManageService {
	}
	public List<CharacteristicSpecValue> queryDeviceTypeList() {
		CharacteristicSpec characteristicSpec = this.characteristicSpecService
		CharacteristicSpec characteristicSpec = characteristicSpecService
				.findBusinessSpecByCharSpecCode(EbcConstant.BUSINESS_SPEC_PRODUCT_TYPE);
		if (characteristicSpec == null) {
			return new ArrayList<CharacteristicSpecValue>();
		}
		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);
		// 调用北向接口
		String url = NorthboundInterfaceConstant.queryOneDevice + params.get("deviceId");
		Map<String, Object> deviceInfoMap = northboundInterfaceUtil.iotGetCallUtil(url);
		JSONObject deviceInfoJson = (JSONObject) deviceInfoMap.get("result");
		if (deviceInfoJson == null) {
			return new HashMap<String, Object>();
		}
		Map<String, Object> resultMap = new HashMap<String, Object>();
		resultMap.put("deviceId", deviceInfoJson.get("deviceId"));
		resultMap.put("deviceNo", deviceInfoJson.get("deviceId"));
		resultMap.put("remarks", deviceInfoJson.get("remarks"));
		// 终端类型
		List<CharacteristicSpecValue> characteristicSpecValueList = queryDeviceTypeList();
		for (CharacteristicSpecValue characteristicSpecValue : characteristicSpecValueList) {
			if (deviceInfoJson.get("productId").equals(characteristicSpecValue.getCode())) {
				resultMap.put("deviceTypeId", deviceInfoJson.get("productId"));
				resultMap.put("deviceTypeName", characteristicSpecValue.getValue());
				break;
			}
		}
		return resultMap;
	}
	
	@Override
	public Map<String, String> addDeviceInfo(Map<String, String> params) throws Exception {
	public Map<String, Object> 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("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;
		Map<String, Object> resultMap = northboundInterfaceUtil.iotPostCallUtil(url, paramsMap);
		return resultMap;
	}
	
	@Override
	public Map<String, String> modifyDeviceInfo(Map<String, String> params) throws Exception {
	public Map<String, Object> 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("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;
		Map<String, Object> resultMap = northboundInterfaceUtil.iotPostCallUtil(url, paramsMap);
		return resultMap;
	}
	
	@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);
	public Map<String, Object> deleteDeviceInfo(Map<String, String> params) throws Exception {
		Map<String, Object> resultMap = null;
		if (unbindDevice(params)) {
			// 调用北向接口
			String url = NorthboundInterfaceConstant.deleteDevice + params.get("deviceId");
			resultMap = northboundInterfaceUtil.iotGetCallUtil(url);
		}
		return resultMap;
	}
	@Override
	public boolean bindDevice(Map<String, String> params) throws Exception {
		boolean result=false;
		if (unbindDevice(params)) {
			if (EbcConstant.BIND_DEVICE_TYPE_USER.equals(params.get("bindType"))) {
				//与人员绑定
				EmployeeTerminalRela employeeTerminalRela = new EmployeeTerminalRela();
				employeeTerminalRela.setRelaType("1");//TODO 关系类型
				  employeeTerminalRela.setWorkEmployeeId(params.get("workEmployeeId"));//用户ID
				  employeeTerminalRela.setTerminalId(params.get("deviceId"));//终端ID
				  CommonRequest<EmployeeTerminalRela> resourceEmployeeTerminalRelalCommonRequest = new CommonRequest<EmployeeTerminalRela>(employeeTerminalRela);
				  
				  CommonResponse<EmployeeTerminalRela> createRelaResult = employeeTerminalRelaCommand.createIndividualDevRela(resourceEmployeeTerminalRelalCommonRequest);
				  result=createRelaResult.isSuccess();
				  
			}else if (EbcConstant.BIND_DEVICE_TYPE_SHIP.equals(params.get("bindType"))) {
				//与工具绑定
				ResourceToolTerminalRel resourceToolTerminalRel=new ResourceToolTerminalRel();
				resourceToolTerminalRel.setRelaType("LOC");//TODO 关系类型，默认可填'LOC'
				resourceToolTerminalRel.setTerminalId(params.get("deviceId"));//终端ID
				resourceToolTerminalRel.setResourceToolId(params.get("toolId"));//设备ID
				CommonRequest<ResourceToolTerminalRel> resourceToolTerminalRelCommonRequest =new CommonRequest<ResourceToolTerminalRel>(resourceToolTerminalRel);
				
				CommonResponse<ResourceToolTerminalRel> createRelaResult = resourceToolCommand.createWorkToolsDevRela(resourceToolTerminalRelCommonRequest);
				result=createRelaResult.isSuccess();
				
				// 根据终端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;
			}
		}
		return result;
	}
	@Override
	public Map<String, Object> queryBindDeviceInfo(Map<String, String> params) throws Exception {
		List<String> deviceIdList=new ArrayList<String>();
		deviceIdList.add(params.get("deviceId"));
		HashMap<String, Object> deviceIdListMap=new HashMap<String, Object>();
		deviceIdListMap.put("deviceIdList", deviceIdList);
		
		
		
		// 终端与人员绑定
		CommonResponse<List<EmployeeTerminalRelaDto>> bindEmployeeInfoCommon = employeeTerminalRelaQuery
				.queryIndividualDevRela(new CommonRequest<List<String>>(deviceIdList));
		List<EmployeeTerminalRelaDto> bindEmployeeInfoList = bindEmployeeInfoCommon.getData();
		
		
		
		// 终端与工具绑定
		CommonResponse<PageInfo<Map<String, Object>>> bindToolInfoCommon = resourceToolQuery
				.queryWorkToolsDevRela(new CommonRequest<HashMap<String, Object>>(deviceIdListMap));
		List<Map<String, Object>> bindToolInfoList = bindToolInfoCommon.getData().getData();
			
			
			
		
		return null;
	}
	@Override
	public boolean unbindDevice(Map<String, String> params) throws Exception {
		String[] deviceIds = params.get("deviceId").split(",");
		List<String> deviceIdList = new ArrayList<String>();
		for (String deviceId : deviceIds) {
			deviceIdList.add(deviceId);
		}
		// 根据终端id删除终端关联信息
		CommonResponse deleteRelaResult = resourceToolCommand
				.deleteWorkToolsDevRelaByTerminalId(new CommonRequest(deviceIdList));
		CommonResponse<Void> resopnse = employeeTerminalRelaCommand
				.deleteIndividualDevRela(new CommonRequest(deviceIdList));
		return deleteRelaResult.isSuccess() && resopnse.isSuccess();
	}
	@Override
	public List<Map<String, Object>> queryAssociatInfo(Map<String, String> params) throws Exception {
		if (EbcConstant.BIND_DEVICE_TYPE_USER.equals(params.get("type"))) {
			// 类型是用户，查询用户列表
			
			
		} else if (EbcConstant.BIND_DEVICE_TYPE_SHIP.equals(params.get("type"))) {
			// 类型是船舶，查询船舶列表
			
		}
		return null;
	}
	
	
	
	
	
	
	
	
	
	/*@Override
	public Map<String, Object> queryPageDeviceInfo(Map<String, Object> params, int pageNum, int pageSize)
			throws Exception {
@@ -291,11 +406,11 @@ public class DeviceManageServiceImpl implements DeviceManageService {
	
	@Override
	public List<Map<String, Object>> queryAssociatInfo(Map<String, Object> params) throws Exception {
		if (EbcConstant.bind_device_type_user.equals(params.get("type"))) {
		if (EbcConstant.BIND_DEVICE_TYPE_USER.equals(params.get("type"))) {
			// 类型是用户，查询用户列表
			// TODO 调用uspa接口获取人员信息 暂时用枚举
			return UserEnums.getAllUserList();
		} else if (EbcConstant.bind_device_type_ship.equals(params.get("type"))) {
		} else if (EbcConstant.BIND_DEVICE_TYPE_SHIP.equals(params.get("type"))) {
			// 类型是船舶，查询船舶列表
			return deviceManageDao.queryAssociatBoatInfo(params);
		}

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

@@ -3,6 +3,8 @@ package com.ai.bss.location.rescue.service.interfaces;
import java.util.List;
import java.util.Map;
import org.springframework.web.bind.annotation.RequestBody;
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
public interface DeviceManageService {
@@ -22,7 +24,7 @@ public interface DeviceManageService {
	 * @return
	 */
	List<CharacteristicSpecValue> queryDeviceTypeList();
	
	/**
	* 获取单个终端信息
	* @param params
@@ -30,55 +32,67 @@ public interface DeviceManageService {
	* @throws Exception
	*/
Map<String, Object> queryOneDeviceInfo(Map<String, String> params) throws Exception;
	Map<String, Object> queryOneDeviceInfo(Map<String, String> params) throws Exception;
	/**
		* 新增终端信息
		* @param params
		* @return
		* @throws Exception
		*/
	Map<String, Object> addDeviceInfo(Map<String, String> params) throws Exception;
/**
	* 新增终端信息
	/**
		* 修改终端信息
		* @param params
		* @return
		* @throws Exception
		*/
	Map<String, Object> modifyDeviceInfo(Map<String, String> params) throws Exception;
	/**
		* 删除终端信息
		* @param params
		* @return
		* @throws Exception
		*/
	Map<String, Object> deleteDeviceInfo(Map<String, String> params) throws Exception;
	/**
	* 绑定终端
	* @param params
	* @param type
	* @return
	* @throws Exception
	*/
	boolean bindDevice(Map<String, String> params) throws Exception;
Map<String, String> addDeviceInfo(Map<String, String> params) throws Exception;
	/**
	 * 查询绑定关系信息
	 * @param params
	 * @return
	 * @throws Exception
	 */
	Map<String, Object> queryBindDeviceInfo(Map<String, String> params) throws Exception;
/**
	* 修改终端信息
	/**
	* 解绑终端
	* @param params
	* @return
	* @throws Exception
	*/
	boolean unbindDevice(Map<String, String> params) throws Exception;
Map<String, String> modifyDeviceInfo(Map<String, String> params) throws Exception;
/**
	* 删除终端信息
	/**
	* 获取人员或船舶的下拉列表数据
	* @param params
	* @return
	* @throws Exception
	*/
Map<String, String> deleteDeviceInfo(Map<String, String> params) throws Exception;
	List<Map<String, Object>> queryAssociatInfo(Map<String, String> params) throws Exception;
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	/**
	 * 获取下拉列表的终端信息
	 * @param params
@@ -90,34 +104,8 @@ Map<String, String> deleteDeviceInfo(Map<String, String> params) throws Exceptio
	/*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;
	
	*//**

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

@@ -68,7 +68,7 @@ public class NorthboundInterfaceUtil {
	 * @return
	 * @throws Exception
	 */
	public Map<String, String> iotGetCallUtil(String url) throws Exception {
	public Map<String, Object> iotGetCallUtil(String url) throws Exception {
		// 调用北向服务的接口
		logger.debug("GET调用北向接口");
@@ -83,7 +83,7 @@ public class NorthboundInterfaceUtil {
		if (!loginFlag) {
			logger.debug("调用北向接口登录失败");
			return new HashMap<String, String>();
			return new HashMap<String, Object>();
		}
		// 3.调用北向服务接口
@@ -92,7 +92,7 @@ public class NorthboundInterfaceUtil {
		// (2)调用接口
		String resultJson = HttpServiceUtil.sendGet(iotServiceUrl + url, charset);
		// (3)将参数转为Map<String,String>【将返回值统一为String】
		Map<String, String> resultMap = JSON.parseObject(resultJson, Map.class);
		Map<String, Object> resultMap = JSON.parseObject(resultJson, Map.class);
		// 4.登录超时，需重新登录
		if ("登录超时".equals(resultMap.get("resultMsg"))) {
@@ -105,7 +105,7 @@ public class NorthboundInterfaceUtil {
			if (!loginFlag) {
				logger.debug("再次调用北向接口登录失败");
				return new HashMap<String, String>();
				return new HashMap<String, Object>();
			}
			try {
@@ -115,12 +115,12 @@ public class NorthboundInterfaceUtil {
				resultMap = JSON.parseObject(fianlresultJson, Map.class);
			} catch (Exception e) {
				logger.error("再次调用北向接口失败: " + e.getMessage());
				return new HashMap<String, String>();
				return new HashMap<String, Object>();
			}
			if (resultMap == null) {
				logger.error("再次调用北向接口返回值为空");
				return new HashMap<String, String>();
				return new HashMap<String, Object>();
			}
		}
@@ -142,7 +142,7 @@ public class NorthboundInterfaceUtil {
	 * @return
	 * @throws Exception
	 */
	public Map<String, String> iotPostCallUtil(String url, Map<String, Object> paramsMap) throws Exception {
	public Map<String, Object> iotPostCallUtil(String url, Map<String, Object> paramsMap) throws Exception {
		// 调用北向服务的接口
		logger.debug("POSt调用北向接口");
@@ -157,14 +157,14 @@ public class NorthboundInterfaceUtil {
		if (!loginFlag) {
			logger.debug("调用北向接口登录失败");
			return new HashMap<String, String>();
			return new HashMap<String, Object>();
		}
		// 3.调用北向服务接口
		// (1)设置字符集
		Charset charset = Charset.forName("utf-8");
		// 返回值
		Map<String, String> resultMap = null;
		Map<String, Object> resultMap = null;
		try {
			// (2)调用接口
			String resultJson = HttpServiceUtil.sendPost(iotServiceUrl + url, paramsMap, charset, getMapCache());
@@ -172,12 +172,12 @@ public class NorthboundInterfaceUtil {
			resultMap = JSON.parseObject(resultJson, Map.class);
		} catch (Exception e) {
			logger.error("调用北向接口失败: " + e.getMessage());
			return new HashMap<String, String>();
			return new HashMap<String, Object>();
		}
		if (resultMap == null) {
			logger.error("调用北向接口返回值为空");
			return new HashMap<String, String>();
			return new HashMap<String, Object>();
		}
		// 4.登录超时，需重新登录
@@ -191,7 +191,7 @@ public class NorthboundInterfaceUtil {
			if (!loginFlag) {
				logger.debug("再次调用北向接口登录失败");
				return new HashMap<String, String>();
				return new HashMap<String, Object>();
			}
			try {
@@ -202,12 +202,12 @@ public class NorthboundInterfaceUtil {
				resultMap = JSON.parseObject(fianlresultJson, Map.class);
			} catch (Exception e) {
				logger.error("再次调用北向接口失败: " + e.getMessage());
				return new HashMap<String, String>();
				return new HashMap<String, Object>();
			}
			if (resultMap == null) {
				logger.error("再次调用北向接口返回值为空");
				return new HashMap<String, String>();
				return new HashMap<String, Object>();
			}
		}

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

@@ -3,10 +3,10 @@ server.port=8086
# DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)
#spring.datasource.url=jdbc:mysql://localhost:3306/cmp
spring.datasource.url=jdbc:mysql://10.11.20.120:3306/common_frm?serverTimezone=Asia/Shanghai&characterEncoding=utf-8&verifyServerCertificate=false&useSSL=false&requireSSL=false
spring.datasource.url=jdbc:mysql://10.19.90.34:3307/energy
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.username=comon_frm
spring.datasource.password=1qaz@WSX
spring.datasource.username=ebc
spring.datasource.password=ebc@123
# JPA (JpaBaseConfiguration, HibernateJpaAutoConfiguration)
#spring.jpa.database=default