修改终端类型查询

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

@@ -81,6 +81,11 @@ public class DeviceManageServiceImpl implements DeviceManageService {
		// 终端类型
		List<Map<String,String>> deviceTypeList = queryDeviceTypeList();
		if (null == params.get("deviceTypeId") || "".equals(params.get("deviceTypeId"))) {
			if (null==deviceTypeList||deviceTypeList.isEmpty()) {
				//如果没有终端类型，则返回为空
				return new HashMap<String, Object>();
			}
			
			List<String> specIds = new ArrayList<String>();
			for (Map<String,String> deviceTypeMap : deviceTypeList) {
				specIds.add(deviceTypeMap.get("deviceTypeId"));
@@ -96,11 +101,11 @@ public class DeviceManageServiceImpl implements DeviceManageService {
		if (bindDeviceBoolean || unBindDeviceBoolean) {
			// 终端与工具绑定
			CommonResponse<PageInfo<Map<String, Object>>> bindToolInfoCommon = resourceToolQuery
					.queryWorkToolsDevRela(null);
					.queryWorkToolsDevRela(new CommonRequest<HashMap<String,Object>>(new HashMap<String,Object>()));
			bindToolInfoList = bindToolInfoCommon.getData().getData();
			// 终端与人员绑定
			CommonResponse<List<EmployeeTerminalRelaDto>> bindEmployeeInfoCommon = employeeTerminalRelaQuery
					.queryIndividualDevRela(null);
					.queryIndividualDevRela(new CommonRequest<List<String>>(new ArrayList<String>()));
			bindEmployeeInfoList = bindEmployeeInfoCommon.getData();
			// 终端ID

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

@@ -40,8 +40,11 @@ public class MapTagManageServiceImpl implements MapTagManageService {
	public PageBean<Map<String, Object>> queryPageMapTagInfo(Map<String,String> params, int pageNumber, int pageSize) throws Exception {
		Map<String, Object> data = new HashMap<String, Object>();
		data.put("entityId", "0000"); //TODO 组织id
		data.put("mapAreaName", params.get("mapAreaName"));  //围栏名称模糊查询
		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);
@@ -90,7 +93,7 @@ public class MapTagManageServiceImpl implements MapTagManageService {
		for (CharacteristicSpecValue characteristicSpecValue:characteristicSpec.getCharacteristicSpecValues()) {
			Map<String,String> map=new HashMap<String,String>();
			map.put("mapAreaTypeId",characteristicSpecValue.getCode());
			map.put("mapAreaTypeName ",characteristicSpecValue.getValue());
			map.put("mapAreaTypeName",characteristicSpecValue.getValue());
			resultList.add(map);
		}

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

@@ -67,7 +67,7 @@ public class WorkEmployeeServiceImpl implements WorkEmployeeService {
        for (CharacteristicSpecValue characteristicSpecValue:characteristicSpec.getCharacteristicSpecValues()) {
            Map<String,String> map=new HashMap<String,String>();
            map.put("jobPositionId",characteristicSpecValue.getCode());
            map.put("jobPositionName ",characteristicSpecValue.getValue());
            map.put("jobPositionName",characteristicSpecValue.getValue());
            resultList.add(map);
        }