wangchao 4 anni fa
parent
commit
2f12fb16fb

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

@ -292,21 +292,18 @@ public class DeviceManageServiceImpl implements DeviceManageService {
292 292
				//与人员绑定
293 293
				EmployeeTerminalRela employeeTerminalRela = new EmployeeTerminalRela();
294 294
				employeeTerminalRela.setRelaType("1");//TODO 关系类型
295
				  employeeTerminalRela.setWorkEmployeeId(params.get("workEmployeeId"));//用户ID
296
				  employeeTerminalRela.setTerminalId(params.get("deviceId"));//终端ID
297
				  CommonRequest<EmployeeTerminalRela> resourceEmployeeTerminalRelalCommonRequest = new CommonRequest<EmployeeTerminalRela>(employeeTerminalRela);
298
				  
299
				  CommonResponse<EmployeeTerminalRela> createRelaResult = employeeTerminalRelaCommand.createIndividualDevRela(resourceEmployeeTerminalRelalCommonRequest);
300
				  result=createRelaResult.isSuccess();
301
				  
295
				employeeTerminalRela.setWorkEmployeeId(params.get("associatedId"));//用户ID
296
				employeeTerminalRela.setTerminalId(params.get("deviceId"));//终端ID
297
				CommonRequest<EmployeeTerminalRela> resourceEmployeeTerminalRelalCommonRequest = new CommonRequest<EmployeeTerminalRela>(employeeTerminalRela);
298
				CommonResponse<EmployeeTerminalRela> createRelaResult = employeeTerminalRelaCommand.createIndividualDevRela(resourceEmployeeTerminalRelalCommonRequest);
299
				result=createRelaResult.isSuccess();
302 300
			}else if (EbcConstant.BIND_DEVICE_TYPE_SHIP.equals(params.get("bindType"))) {
303 301
				//与工具绑定
304 302
				ResourceToolTerminalRel resourceToolTerminalRel=new ResourceToolTerminalRel();
305 303
				resourceToolTerminalRel.setRelaType("LOC");//TODO 关系类型,默认可填'LOC'
306 304
				resourceToolTerminalRel.setTerminalId(params.get("deviceId"));//终端ID
307
				resourceToolTerminalRel.setResourceToolId(params.get("toolId"));//设备ID
305
				resourceToolTerminalRel.setResourceToolId(params.get("associatedId"));//设备ID
308 306
				CommonRequest<ResourceToolTerminalRel> resourceToolTerminalRelCommonRequest =new CommonRequest<ResourceToolTerminalRel>(resourceToolTerminalRel);
309
				
310 307
				CommonResponse<ResourceToolTerminalRel> createRelaResult = resourceToolCommand.createWorkToolsDevRela(resourceToolTerminalRelCommonRequest);
311 308
				result=createRelaResult.isSuccess();
312 309
				
@ -375,6 +372,9 @@ public class DeviceManageServiceImpl implements DeviceManageService {
375 372
		if (EbcConstant.BIND_DEVICE_TYPE_USER.equals(params.get("bindType"))) {
376 373
377 374
			// 类型是用户,查询用户列表,模糊查询
375
			//	CommonRequest<UserDto> request) {
376
			//  UserDto rawParam = request.getData();
377
			//  PageBean<UserDto> result = userDtoDao.getUserDto(rawParam, request.getPageNumber(), request.getPageSize());
378 378
			UserDto userDto=new UserDto();
379 379
			String username=(params.get("name")!=null||!"".equals(params.get("name")))?(String) params.get("name"):null;
380 380
			userDto.setName(username);