统一地图标记和终端管理的返回格式

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

@@ -1,19 +1,20 @@
package com.ai.bss.location.rescue.controller;
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;
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.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;
/**
 * 终端管理
@@ -33,7 +34,7 @@ public class DeviceManageController {
	 */
	@ResponseBody
	@RequestMapping("/queryPageDeviceInfo")
	public Map<String, Object> queryPageDeviceInfo(@RequestBody CommonRequest<Map<String, String>> request)
	public CommonResponse<PageInfo<Map<String, Object>>> queryPageDeviceInfo(@RequestBody CommonRequest<Map<String, String>> request)
			throws Exception {
		// 当前页数
		int pageNumber = request.getPageNumber() < 1 ? 1 : request.getPageNumber();
@@ -42,9 +43,11 @@ public class DeviceManageController {
		Map<String, String> params = request.getData() == null ? new HashMap<String, String>() : request.getData();
		Map<String, Object> result = deviceManageService.queryPageDeviceInfo(params, pageNumber, pageSize);
		PageInfo<Map<String, Object>> resultPage = deviceManageService.queryPageDeviceInfo(params, pageNumber, pageSize);
		return result;
		CommonResponse<PageInfo<Map<String, Object>>> commonResponse=CommonResponse.ok(resultPage);
		return commonResponse;
	}
	/**
@@ -53,13 +56,10 @@ public class DeviceManageController {
	 */
	@ResponseBody
	@RequestMapping("/queryDeviceTypeList")
	public Map<String, Object> queryDeviceTypeList() {
		Map<String, Object> result = new HashMap<String, Object>();
	public CommonResponse<List<Map<String,String>>> queryDeviceTypeList() {
		List<Map<String,String>> resultList = deviceManageService.queryDeviceTypeList();
		result.put("dataList", resultList);
		return result;
		return CommonResponse.ok(resultList);
	}
	/**
@@ -71,19 +71,16 @@ public class DeviceManageController {
	 */
	@ResponseBody
	@RequestMapping("/queryOneDeviceInfo")
	public Map<String, Object> queryOneDeviceInfo(@RequestBody Map<String, String> params) throws Exception {
		Map<String, Object> result = new HashMap<String, Object>();
	public CommonResponse<Map<String,Object>> queryOneDeviceInfo(@RequestBody Map<String, String> params) throws Exception {
		if (params == null || params.get("deviceId") == null||"".equals(params.get("deviceId"))) {
			result.put("result", false);
			result.put("errMsg", "操作失败");
			return result;
			return CommonResponse.fail("500","操作失败");
		}
		Map<String, Object> resultMap = deviceManageService.queryOneDeviceInfo(params);
		result.put("resultData", resultMap);
		result.put("result", true);
		return result;
		CommonResponse<Map<String,Object>> commonResponse=CommonResponse.ok(resultMap);
		return commonResponse;
	}
	/**
@@ -95,25 +92,18 @@ public class DeviceManageController {
	 */
	@ResponseBody
	@RequestMapping("/addDeviceInfo")
	public Map<String, Object> addDeviceInfo(@RequestBody Map<String, String> params) throws Exception {
		Map<String, Object> result = new HashMap<String, Object>();
	public CommonResponse<Void> addDeviceInfo(@RequestBody Map<String, String> params) throws Exception {
		if (params == null || params.get("deviceNo") == null||"".equals(params.get("deviceNo"))) {
			result.put("result", false);
			result.put("errMsg", "添加失败");
			return result;
			return CommonResponse.fail("500","添加失败");
		}
		Map<String, Object> resultMap = deviceManageService.addDeviceInfo(params);
		if (NorthboundInterfaceConstant.resultCode_succeed.equals(String.valueOf(resultMap.get("resultCode")))) {
			result.put("result", true);
			return CommonResponse.ok(null);
		} else {
			result.put("result", false);
			result.put("errMsg", "添加失败:" + resultMap.get("resultMsg"));
			return CommonResponse.fail("505","添加失败:" + resultMap.get("resultMsg"));
		}
		return result;
	}
	/**
@@ -125,25 +115,18 @@ public class DeviceManageController {
	 */
	@ResponseBody
	@RequestMapping("/modifyDeviceInfo")
	public Map<String, Object> modifyDeviceInfo(@RequestBody Map<String, String> params) throws Exception {
		Map<String, Object> result = new HashMap<String, Object>();
	public CommonResponse<Void> modifyDeviceInfo(@RequestBody Map<String, String> params) throws Exception {
		if (params == null || params.get("deviceId") == null||"".equals(params.get("deviceId"))) {
			result.put("result", false);
			result.put("errMsg", "修改失败");
			return result;
			return CommonResponse.fail("500","修改失败");
		}
		Map<String, Object> resultMap = deviceManageService.modifyDeviceInfo(params);
		if (NorthboundInterfaceConstant.resultCode_succeed.equals(String.valueOf(resultMap.get("resultCode")))) {
			result.put("result", true);
			return CommonResponse.ok(null);
		} else {
			result.put("result", false);
			result.put("errMsg", "修改失败:" + resultMap.get("resultMsg"));
			return CommonResponse.fail("505","修改失败:" + resultMap.get("resultMsg"));
		}
		return result;
	}
	/**
@@ -155,30 +138,22 @@ public class DeviceManageController {
	 */
	@ResponseBody
	@RequestMapping("/deleteDeviceInfo")
	public Map<String, Object> deleteDeviceInfo(@RequestBody Map<String, String> params) throws Exception {
		Map<String, Object> result = new HashMap<String, Object>();
	public CommonResponse<Void> deleteDeviceInfo(@RequestBody Map<String, String> params) throws Exception {
		if (params == null || params.get("deviceId") == null||"".equals(params.get("deviceId"))) {
			result.put("result", false);
			result.put("errMsg", "删除失败");
			return result;
			return CommonResponse.fail("500","删除失败");
		}
		Map<String, Object> resultMap = deviceManageService.deleteDeviceInfo(params);
		if (resultMap != null
				&& NorthboundInterfaceConstant.resultCode_succeed.equals(String.valueOf(resultMap.get("resultCode")))) {
			result.put("result", true);
		if (NorthboundInterfaceConstant.resultCode_succeed.equals(String.valueOf(resultMap.get("resultCode")))) {
			return CommonResponse.ok(null);
		} else {
			result.put("result", false);
			if ("只有注册或停用状态的设备才能删除！".equals(String.valueOf(resultMap.get("resultMsg")))){
				resultMap.put("resultMsg","终端已上传数据");
			}
			result.put("errMsg", "删除失败:" + resultMap.get("resultMsg"));
			return CommonResponse.fail("505","删除失败:" + resultMap.get("resultMsg"));
		}
		return result;
	}
	/**
@@ -189,20 +164,16 @@ public class DeviceManageController {
	 */
	@ResponseBody
	@RequestMapping("/queryBindDeviceInfo")
	public Map<String, Object> queryBindDeviceInfo(@RequestBody Map<String, String> params) throws Exception {
		Map<String, Object> result = new HashMap<String, Object>();
	public CommonResponse<Map<String,Object>> queryBindDeviceInfo(@RequestBody Map<String, String> params) throws Exception {
		if (params == null || params.get("deviceId") == null||"".equals(params.get("deviceId"))) {
			result.put("result", false);
			result.put("errMsg", "获取绑定关系失败");
			return result;
			return CommonResponse.fail("500","获取绑定关系失败");
		}
		Map<String, Object> resultMap  = deviceManageService.queryBindDeviceInfo(params);
		result.put("resultData", resultMap);
		result.put("result", true);
		return result;
		CommonResponse<Map<String,Object>> commonResponse=CommonResponse.ok(resultMap);
		return commonResponse;
	}
	
	/**
@@ -228,25 +199,13 @@ public class DeviceManageController {
	 */
	@ResponseBody
	@RequestMapping("/bindDevice")
	public Map<String, Object> bindDevice(@RequestBody Map<String, String> params) throws Exception {
		Map<String, Object> result = new HashMap<String, Object>();
	public CommonResponse<Void> bindDevice(@RequestBody Map<String, String> params) throws Exception {
		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 CommonResponse.fail("500","关联终端失败");
		}
		return result;
		return deviceManageService.bindDevice(params);
	}
	
	/**
@@ -257,128 +216,13 @@ public class DeviceManageController {
	 */
	@ResponseBody
	@RequestMapping("/unbindDevice")
	public Map<String, Object> unbindDevice(@RequestBody Map<String, String> params) throws Exception {
		Map<String, Object> result = new HashMap<String, Object>();
	public CommonResponse<Void> unbindDevice(@RequestBody Map<String, String> params) throws Exception {
		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 CommonResponse.fail("500","解绑终端失败");
		}
		return result;
		return deviceManageService.unbindDevice(params);
	}
	
	/**
	 * 获取下拉列表的终端信息
	 * 
	 * @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("/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;
	}
	
	*//**
		* 获取当前终端最新定位信息
		* 
		* @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;
	}
	
	*//**
		* 按时间段获取终端的定位信息(轨迹回放)
		* 
		* @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);
	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/EquipmentManageController.java

@@ -52,45 +52,6 @@ public class EquipmentManageController {
	}
	/**
	 * 查询单个设备信息
	 * 
	 * @param params
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryOneEquipmentInfo")
	public Map<String, Object> queryOneEquipmentInfo(Map<String, Object> params) throws Exception {
		Map<String, Object> result = new HashMap<String, Object>();
		if (params == null || params.get("FACILITY_ID") == null) {
			result.put("result", false);
			result.put("errMsg", "操作失败");
			return result;
		}
		Map<String, Object> resultMap = equipmentManageService.queryOneEquipmentInfo(params);
		result.put("resultData", resultMap);
		return result;
	}
	/**
	 * 查询设备信息增加时效验重复
	 */
	@ResponseBody
	@RequestMapping("/verifyEquipmentInfoRepetition")
	public Map<String, Object> verifyEquipmentInfoRepetition(Map<String, Object> params) throws Exception {
		Map<String, Object> equipmentMap = equipmentManageService.verifyEquipmentInfoRepetition(params);
		Map<String, Object> result = new HashMap<String, Object>();
		if (equipmentMap == null || equipmentMap.isEmpty()) {
			result.put("result", false);
		} else {
			result.put("result", true);
		}
		return result;
	}
	/**
	 * 编辑设备信息
	 */
	@ResponseBody
@@ -132,46 +93,18 @@ public class EquipmentManageController {
	}
	/**
	 * 批量刪除删除设备信息
	 */
	@ResponseBody
	@RequestMapping("/deleteEquipmentsInfo")
	public Map<String, Object> deleteEquipmentsInfo(List<Map<String, Object>> paramsList) throws Exception {
		boolean flag = false;
		if (!paramsList.isEmpty()) {
			flag = equipmentManageService.deleteEquipmentsInfo(paramsList);
		}
		Map<String, Object> result = new HashMap<String, Object>();
		result.put("result", flag);
		return result;
	}
	/**
	 * 获取所有设备信息(必须具有经纬度)
	 * 获取所有未绑定的设备
	 */
	@ResponseBody
	@RequestMapping("/queryAllEquipmentInfo")
	public Map<String, Object> queryAllEquipmentInfo(Map<String, Object> params) throws Exception {
	@RequestMapping("/queryAllEquipmentNotBind")
	public Map<String, Object> queryAllEquipmentNotBind() throws Exception {
		Map<String, Object> result = new HashMap<String, Object>();
		List<Map<String, Object>> resultList = equipmentManageService.queryCurrentEquipmentLocationInfo(params);
		List<Map<String, Object>> resultList = equipmentManageService.queryAllEquipmentNotBind();
		result.put("dataList", resultList);
		return result;
	}
	/**
	 * 导入设备信息
	 */
	@ResponseBody
	@RequestMapping("/importEquipmentsInfo")
	public Map<String, Object> importEquipmentsInfo(List<Map<String, Object>> paramsList) throws Exception {
		boolean flag = false;
		if (!paramsList.isEmpty()) {
			flag = equipmentManageService.importEquipmentInfo(paramsList);
		}
		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/LocationManagementController.java

@@ -1,9 +1,9 @@
package com.ai.bss.location.rescue.controller;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.location.rescue.service.impl.LocationManagementServiceImpl;
import com.ai.bss.location.rescue.util.MirrorSendDateUtil;
import com.ai.bss.position.service.api.outparam.LoadMapViewParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
@@ -11,10 +11,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ai.bss.location.rescue.service.impl.LocationManagementServiceImpl;
import com.ai.bss.location.rescue.util.MirrorSendDateUtil;
import com.ai.bss.worker.model.EmployeeTerminalRelaDto;
/**
 * 人员定位管理
 * @author konghl@asiainfo.com
@@ -41,19 +37,16 @@ public class LocationManagementController {
		return msg;
	}
	/**
	 * 获取已绑定终端的人员列表
	 * 初始化人员定位页面的数据
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryEmployeeBindDeviceList")
	public Map<String, Object> queryEmployeeBindDeviceList() {
		Map<String, Object> result = new HashMap<String, Object>();
		List<EmployeeTerminalRelaDto> resultList = locationManagementServiceImpl.queryEmployeeBindDeviceList();
		result.put("dataList", resultList);
		return result;
	@RequestMapping("/loadMapLocationView")
	public CommonResponse<LoadMapViewParam> loadMapLocationView() throws Exception {
		return locationManagementServiceImpl.loadMapLocationView();
	}
}

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

@@ -1,23 +1,21 @@
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.slf4j.Logger;
import org.slf4j.LoggerFactory;
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.location.rescue.service.interfaces.MapTagManageService;
import com.ai.bss.location.rescue.util.EbcConstant;
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 com.ai.abc.api.model.CommonRequest;
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.worker.model.MapTagInfoDto;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * 地图标记
@@ -25,9 +23,6 @@ import com.ai.bss.worker.model.MapTagInfoDto;
@Controller
@RequestMapping("/mapTag")
public class MapTagManageController {
    Logger logger = LoggerFactory.getLogger(MapTagManageController.class);
    @Autowired
    MapTagManageService mapTagManageService;
@@ -40,34 +35,26 @@ public class MapTagManageController {
     */
    @ResponseBody
    @RequestMapping("/queryPageMapTagInfo")
    public PageBean<Map<String, Object>> queryPageMapTagInfo(@RequestBody CommonRequest<Map<String, String>> request) throws Exception {
    public CommonResponse<PageBean<Map<String, Object>>> queryPageMapTagInfo(@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();
        PageBean<Map<String, Object>> result = mapTagManageService.queryPageMapTagInfo(request.getData(), pageNumber, pageSize);
        return result;
        return mapTagManageService.queryPageMapTagInfo(request.getData(), pageNumber, pageSize);
    }
    /**
     * 获取所有围栏信息
     * 按部门查询所有围栏信息
     *
     * @param params
     * @return
     * @throws Exception
     */
    @ResponseBody
    @RequestMapping("/queryAllMapTagInfo")
    public Map<String, Object> queryAllMapTagInfo(@RequestBody Map<String, String> params) throws Exception {
        Map<String, Object> result = new HashMap<String, Object>();
        List<Map<String, Object>> resultList = mapTagManageService.queryListMapTagInfo(params);
        result.put("dataList", resultList);
        result.put("result", true);
        return result;
    @RequestMapping("/queryAllMapTagByOrg")
    public CommonResponse<List<Map<String, Object>>> queryAllMapTagByOrg(@RequestBody Map<String, String> params) throws Exception {
        return mapTagManageService.queryAllMapTagByOrg(params);
    }
    /**
@@ -79,26 +66,14 @@ public class MapTagManageController {
     */
    @ResponseBody
    @RequestMapping("/queryOneMapTagInfo")
    public Map<String, Object> queryOneMapTagInfo(@RequestBody Map<String, String> params) throws Exception {
    public CommonResponse<List<Map<String, Object>>> queryOneMapTagInfo(@RequestBody Map<String, String> params) throws Exception {
        Map<String, Object> result = new HashMap<String, Object>();
        if (params == null || params.get("mapTagId") == null) {
            result.put("result", false);
            result.put("errMsg", "操作失败");
            return result;
            return CommonResponse.fail("500","操作失败");
        }
        Map<String, Object> resultMap = mapTagManageService.queryOneMapTagInfo(params);
        if (resultMap == null) {
            result.put("errMsg", "操作失败:标记不存在");
            result.put("result", false);
        } else {
            result.put("resultData", resultMap);
            result.put("result", true);
        }
        return result;
        return mapTagManageService.queryOneMapTagInfo(params);
    }
    /**
@@ -108,13 +83,12 @@ public class MapTagManageController {
     */
    @ResponseBody
    @RequestMapping("/queryMapAreaTypeList")
    public Map<String, Object> queryMapAreaTypeList() {
        Map<String, Object> result = new HashMap<String, Object>();
    public CommonResponse<List<Map<String, String>>> queryMapAreaTypeList() {
        List<Map<String, String>> resultList = mapTagManageService.queryMapAreaTypeList();
        result.put("dataList", resultList);
        CommonResponse<List<Map<String,String>>> commonResponse=CommonResponse.ok(resultList);
        return result;
        return commonResponse;
    }
    /**
@@ -126,19 +100,14 @@ public class MapTagManageController {
     */
    @ResponseBody
    @RequestMapping("/addMapTagInfo")
    public Map<String, Object> addMapTagInfo(@RequestBody MapTagInfoDto mapTagInfoDto) throws Exception {
    public CommonResponse<Void> addMapTagInfo(@RequestBody MapTagInfoDto mapTagInfoDto) throws Exception {
        Map<String, Object> result = new HashMap<String, Object>();
        if (mapTagInfoDto == null || mapTagInfoDto.getMapAreaName() == null || mapTagInfoDto.getMapAreaContent() == null) {
            result.put("result", false);
            result.put("errMsg", "添加失败");
            return result;
            return CommonResponse.fail("500","添加失败");
        }
        boolean resultFlag = mapTagManageService.addMapTagInfo(mapTagInfoDto);
        result.put("result", true);
        result.put("data", resultFlag);
        return result;
        return mapTagManageService.addMapTagInfo(mapTagInfoDto);
    }
    /**
@@ -150,18 +119,14 @@ public class MapTagManageController {
     */
    @ResponseBody
    @RequestMapping("/modifyMapTagInfo")
    public Map<String, Object> modifyMapTagInfo(@RequestBody MapTagInfoDto mapTagInfoDto) throws Exception {
    public CommonResponse<Void> modifyMapTagInfo(@RequestBody MapTagInfoDto mapTagInfoDto) throws Exception {
        Map<String, Object> result = new HashMap<String, Object>();
        if (mapTagInfoDto == null || mapTagInfoDto.getMapAreaName() == null || mapTagInfoDto.getMapAreaId() == null || mapTagInfoDto.getMapAreaContent() == null) {
            result.put("result", false);
            result.put("errMsg", "修改失败");
            return result;
            return CommonResponse.fail("500","修改失败");
        }
        boolean resultFlag = mapTagManageService.modifyMapTagInfo(mapTagInfoDto);
        result.put("result", resultFlag);
        return result;
        return mapTagManageService.modifyMapTagInfo(mapTagInfoDto);
    }
    /**
@@ -173,13 +138,11 @@ public class MapTagManageController {
     */
    @ResponseBody
    @RequestMapping("/deleteMapTagInfo")
    public Map<String, Object> deleteMapTagInfo(@RequestBody Map<String, Object> params) throws Exception {
    public CommonResponse<Void> deleteMapTagInfo(@RequestBody Map<String, Object> params) throws Exception {
        Map<String, Object> result = new HashMap<String, Object>();
        if (params == null || params.get("mapTagIds") == null) {
            result.put("result", false);
            result.put("errMsg", "删除失败:标记无效");
            return result;
            return CommonResponse.fail("500","删除失败");
        }
        List<String> mapTagIdsList = null;
@@ -189,14 +152,10 @@ public class MapTagManageController {
            mapTagIdsList = new ArrayList<String>();
            mapTagIdsList.add((String) params.get("mapTagIds"));
        } else {
            result.put("result", false);
            result.put("errMsg", "删除失败:标记类型错误");
            return result;
            return CommonResponse.fail("501","删除失败:标记类型错误");
        }
        boolean resultFlag = mapTagManageService.deleteMapTagInfo(mapTagIdsList);
        result.put("result", resultFlag);
        return result;
        return  mapTagManageService.deleteMapTagInfo(mapTagIdsList);
    }
}

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

@@ -1,22 +1,22 @@
package com.ai.bss.location.rescue.controller;
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.constant.CommonConstant;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.location.rescue.service.interfaces.WorkEmployeeService;
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;
/**
 * 用户信息
@@ -25,15 +25,15 @@ import com.ai.bss.user.dto.UserDto;
@RequestMapping("/workEmployee")
public class WorkEmployeeController {
	@Autowired
	WorkEmployeeService userManageService;
    @Autowired
    WorkEmployeeService userManageService;
	/**
	 * 分页查询用户信息
	 */
	@ResponseBody
	@RequestMapping("/queryWorkEmployee")
	public PageBean<UserDto> queryWorkEmployee(@RequestBody CommonRequest<UserDto> request) throws Exception {
    /**
     * 分页查询用户信息
     */
    @ResponseBody
    @RequestMapping("/queryWorkEmployee")
    public CommonResponse<PageBean<UserDto>> queryWorkEmployee(@RequestBody CommonRequest<UserDto> request) throws Exception {
		/*UserDto userDto = new UserDto();
		userDto.setOrgId(params.get("orgId"));
		userDto.setCode(params.get("code"));
@@ -48,65 +48,67 @@ public class WorkEmployeeController {
		CommonRequest<UserDto> request=new CommonRequest<UserDto>(userDto, pageNumber, pageSize);
*/
		//CommonRequest<UserDto> request = CommonRequest.<UserDto>builder().data(userDto).pageNumber(pageNum).pageSize(pageSize).build();
		// TODO 组织编码
		request.getData().setOrgCode("0000");
		PageBean<UserDto> userList = userManageService.queryWorkEmployee(request);
		return userList;
	}
	/**
	 * 查询部门列表
	 */
	@ResponseBody
	@RequestMapping("/queryAllOrganize")
	public List<Organization> queryAllOrganize() throws Exception {
		Organization organize = new Organization();
		//1：只查有效的；0：查全部的
		organize.setDataStatus(CommonConstant.STATUS_NORMAL_STR);
		CommonRequest<Organization> params = CommonRequest.<Organization>builder().data(organize).build();
		List<Organization> allOrgList=userManageService.queryAllOrganize(params);
		return allOrgList;
	}
	/**
	 * 获取职务下拉列表
	 * @return
	 */
	@ResponseBody
	@RequestMapping("/queryJobPositionList")
	public Map<String, Object> queryJobPositionList() throws Exception {
		Map<String, Object> result = new HashMap<String, Object>();
		List<Map<String,String>> resultList = userManageService.queryJobPositionList();
		result.put("dataList", resultList);
		return result;
	}
	
	/**
	 * 增加用户信息
	 */
	@ResponseBody
	@RequestMapping("/createWorkEmployee")
	public boolean createWorkEmployee(@RequestBody EmployeeDto employeeDto ) throws Exception {
		boolean result = userManageService.createWorkEmployee(employeeDto);
		return result;
	}
	/**
	 * 删除用户信息
	 */
	@ResponseBody
	@RequestMapping("/deleteWorkEmployee")
	public boolean deleteWorkEmployee(@RequestBody List<EmployeeDto> employeeDtoList) throws Exception {
		boolean result = userManageService.deleteWorkEmployee(employeeDtoList);
		return result;
	}
        //CommonRequest<UserDto> request = CommonRequest.<UserDto>builder().data(userDto).pageNumber(pageNum).pageSize(pageSize).build();
        return userManageService.queryWorkEmployee(request);
    }
    /**
     * 查询部门列表
     */
    @ResponseBody
    @RequestMapping("/queryAllOrganize")
    public CommonResponse<List<Organization>> queryAllOrganize() throws Exception {
        Organization organize = new Organization();
        //1：只查有效的；0：查全部的
        organize.setDataStatus(CommonConstant.STATUS_NORMAL_STR);
        CommonRequest<Organization> params = CommonRequest.<Organization>builder().data(organize).build();
        return userManageService.queryAllOrganize(params);
    }
    /**
     * 获取职务下拉列表
     *
     * @return
     */
    @ResponseBody
    @RequestMapping("/queryJobPositionList")
    public CommonResponse<List<Map<String, String>>> queryJobPositionList() throws Exception {
        List<Map<String, String>> resultList = userManageService.queryJobPositionList();
        return CommonResponse.ok(resultList);
    }
    /**
     * 增加用户信息
     */
    @ResponseBody
    @RequestMapping("/createWorkEmployee")
    public boolean createWorkEmployee(@RequestBody EmployeeDto employeeDto) throws Exception {
        boolean result = userManageService.createWorkEmployee(employeeDto);
        return result;
    }
    /**
     * 删除用户信息
     */
    @ResponseBody
    @RequestMapping("/deleteWorkEmployee")
    public boolean deleteWorkEmployee(@RequestBody List<EmployeeDto> employeeDtoList) throws Exception {
        boolean result = userManageService.deleteWorkEmployee(employeeDtoList);
        return result;
    }
    /**
     * 获取已绑定终端的人员列表
     *
     * @return
     */
    @ResponseBody
    @RequestMapping("/queryEmployeeBindDeviceList")
    public CommonResponse<List<EmployeeTerminalRelaDto>> queryEmployeeBindDeviceList() {
        return userManageService.queryEmployeeBindDeviceList();
    }
}

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

@@ -1,65 +0,0 @@
package com.ai.bss.location.rescue.dao.impl;
import java.util.List;
import java.util.Map;
import org.springframework.stereotype.Component;
import com.ai.bss.location.rescue.dao.interfaces.EquipmentManageDao;
import com.github.pagehelper.PageInfo;
@Component
public class EquipmentManageDaoImpl implements EquipmentManageDao {
    public static String connName = "ebc";
    private String equipmentTableName = "LR_FACILITY"; //设施表
    @Override
    public PageInfo queryEquipmentInfo(Map<String,Object> params) throws Exception {
        return null;
    }
    @Override
	public Map<String, Object> queryOneEquipmentInfo(Map<String,Object> params) throws Exception{
        return null;
	}
    
    @Override
    public int modifyEquipmentInfo (Map<String,Object> params) throws Exception {
        return 0;
    }
    @Override
    public int addEquipmentInfo(Map<String,Object> params) throws Exception {
        return 0;
    }
    @Override
    public boolean deleteEquipmentInfo(Map<String,Object> params) throws Exception {
        return false;
    }
    @Override
    public boolean deleteEquipmentsInfo(List<Map<String, Object>> paramsList) throws Exception{
        return false;
    }
    @Override
    public boolean importEquipmentInfo(List<Map<String, Object>> paramsList) throws Exception{
        return false;
    }
    @Override
	public List<Map<String, Object>> queryAllEquipmentInfo(Map<String,Object> params) throws Exception {
        return null;
	}
    
    @Override
    public Map<String, Object> verifyEquipmentInfoRepetition(Map<String,Object> params) throws Exception {
        return null;
    }
}

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

@@ -1,32 +0,0 @@
package com.ai.bss.location.rescue.dao.interfaces;
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.work.tool.model.ResourceTool;
import com.github.pagehelper.PageInfo;
public interface EquipmentManageDao {
    PageInfo queryEquipmentInfo(Map<String,Object> params) throws Exception;
    
    Map<String, Object> queryOneEquipmentInfo(Map<String,Object> params) throws Exception;
    int modifyEquipmentInfo(Map<String,Object> params) throws Exception;
    int addEquipmentInfo(Map<String,Object> params) throws Exception;
    boolean deleteEquipmentInfo(Map<String,Object> params) throws Exception;
    boolean deleteEquipmentsInfo(List<Map<String, Object>> paramsList) throws Exception;
    boolean importEquipmentInfo(List<Map<String, Object>> paramsList) throws Exception;
    
    List<Map<String, Object>> queryAllEquipmentInfo(Map<String,Object> params) throws Exception;
    Map<String, Object> verifyEquipmentInfoRepetition(Map<String,Object> params) throws Exception;
}

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

@@ -1,16 +1,5 @@
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 com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.characteristic.spec.model.CharacteristicSpec;
@@ -32,6 +21,12 @@ 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 java.util.*;
@Service
public class DeviceManageServiceImpl implements DeviceManageService {
@@ -60,7 +55,7 @@ public class DeviceManageServiceImpl implements DeviceManageService {
    @Override
    public Map<String, Object> queryPageDeviceInfo(Map<String, String> params, int pageNumber, int pageSize)
    public PageInfo<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);
@@ -83,7 +78,7 @@ public class DeviceManageServiceImpl implements DeviceManageService {
        if (null == params.get("deviceTypeId") || "".equals(params.get("deviceTypeId"))) {
            if (null == deviceTypeList || deviceTypeList.isEmpty()) {
                //如果没有终端类型，则返回为空
                return new HashMap<String, Object>();
                return new PageInfo<Map<String, Object>>();
            }
            for (Map<String, String> deviceTypeMap : deviceTypeList) {
@@ -140,7 +135,7 @@ public class DeviceManageServiceImpl implements DeviceManageService {
        List<Map> deviceInfoList = JSON.parseArray(JSON.toJSONString(deviceInfoListMap.get("result")), Map.class);
        // 整理返回数据信息
        List<Map> resultList = new ArrayList<Map>();
        List<Map<String, Object>> resultList = new ArrayList<Map<String, Object>>();
        if (deviceInfoList != null && deviceInfoList.size() > 0) {
            if (!bindDeviceBoolean && !unBindDeviceBoolean) {
                //绑定和不绑定都需要查询时：根据设备分页查询结果进行查询绑定关系
@@ -212,9 +207,7 @@ public class DeviceManageServiceImpl implements DeviceManageService {
        }
        // 返回数据
        Map<String, Object> result = new HashMap<String, Object>();
        result.put("dataNum", deviceInfoListMap.get("totalResultNumber"));
        result.put("dataList", resultList);
        PageInfo<Map<String, Object>> result = new PageInfo<Map<String, Object>>(Integer.valueOf(String.valueOf(deviceInfoListMap.get("totalResultNumber"))), resultList);
        return result;
    }
@@ -302,7 +295,7 @@ public class DeviceManageServiceImpl implements DeviceManageService {
    @Override
    public Map<String, Object> deleteDeviceInfo(Map<String, String> params) throws Exception {
        Map<String, Object> resultMap = null;
        if (unbindDevice(params)) {
        if (unbindDevice(params).isSuccess()) {
            // 调用北向接口
            String url = NorthboundInterfaceConstant.deleteDevice + params.get("deviceId");
            resultMap = northboundInterfaceUtil.iotGetCallUtil(url);
@@ -312,9 +305,9 @@ public class DeviceManageServiceImpl implements DeviceManageService {
    }
    @Override
    public boolean bindDevice(Map<String, String> params) throws Exception {
    public CommonResponse<Void> bindDevice(Map<String, String> params) throws Exception {
        boolean result = false;
        if (unbindDevice(params)) {
        if (unbindDevice(params).isSuccess()) {
            if (EbcConstant.BIND_DEVICE_TYPE_USER.equals(params.get("bindType"))) {
                //与人员绑定
                EmployeeTerminalRela employeeTerminalRela = new EmployeeTerminalRela();
@@ -336,7 +329,12 @@ public class DeviceManageServiceImpl implements DeviceManageService {
            }
        }
        return result;
        if (result){
            return CommonResponse.ok(null);
        }else{
            return CommonResponse.fail("401","绑定失败");
        }
    }
    @Override
@@ -378,16 +376,14 @@ public class DeviceManageServiceImpl implements DeviceManageService {
    }
    @Override
    public boolean unbindDevice(Map<String, String> params) throws Exception {
    public CommonResponse<Void> unbindDevice(Map<String, String> params) throws Exception {
        List<String> deviceIdList = Arrays.asList(params.get("deviceId").split(","));
        // 根据终端id删除终端关联信息
        CommonResponse deleteRelaResult = resourceToolCommand
                .deleteWorkToolsDevRelaByTerminalId(new CommonRequest(deviceIdList));
        CommonResponse<Void> resopnse = employeeTerminalRelaCommand
         return employeeTerminalRelaCommand
                .deleteIndividualDevRela(new CommonRequest(deviceIdList));
        return deleteRelaResult.isSuccess() && resopnse.isSuccess();
    }
    @Override
@@ -422,306 +418,4 @@ public class DeviceManageServiceImpl implements DeviceManageService {
        return null;
    }
	/*@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 {
		// 查询条件
		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) {
			for (Map map : deviceInfoList) {
				Map<String, String> dataMap = new HashMap<String, String>();
				String deviceId = String.valueOf(map.get("resourceId"));
				dataMap.put("deviceId", deviceId);
				dataMap.put("deviceNo", deviceId);
				dataList.add(dataMap);
			}
		}
	
		return dataList;
	}
	
	@Override
	public List<Map<String, Object>> queryAssociatInfo(Map<String, Object> params) throws Exception {
		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"))) {
			// 类型是船舶，查询船舶列表
			return deviceManageDao.queryAssociatBoatInfo(params);
		}
		return new ArrayList<Map<String, Object>>();
	}
	
	@Override
	public Map<String, Object> verifyUserOrBoatAssociatInfo(Map<String, Object> params) throws Exception {
		// 查询用户与终端关联表，如果有数据返回，无数据返回空
		Map<String, Object> userAndDeviceMap = deviceManageDao.queryOneBindUser(null,
				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")))) {
					map.put("userName", String.valueOf(bindDeviceMap.get("NAME")));
					map.put("userCode", String.valueOf(bindDeviceMap.get("CODE")));
					break;
				}
			}
	
			// 离线信息
			if (map.get("alarmType") != null && EbcConstant.alarm_type_offline_beidou == Integer
					.parseInt(String.valueOf(map.get("alarmType")))) {
				map.put("locationStatus", EbcConstant.location_status_offline);// 定位状态
				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);
						} else {
							// 已指派救援人员
							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:
							// 自动报警
							map.put("locationStatus", EbcConstant.location_status_autosos);
							map.put("alarmType", EbcConstant.alarm_type_autosos_ZH);
							break;
						case EbcConstant.alarm_type_jogsos_ZH:
							// 手动报警
							map.put("locationStatus", EbcConstant.location_status_jogsos);
							map.put("alarmType", EbcConstant.alarm_type_jogsos_ZH);
							break;
						default:
							break;
						}
	
						flag = false;
	
					} else if (deviceId.equals(String.valueOf(alarmMap.get("RESCUER_DEVICE_ID")))) {
						// 救援者
						map.put("locationStatus", EbcConstant.location_status_rescuer);// 定位状态
						// map.put("alarmDeviceId", String.valueOf(alarmMap.get("DEVICE_ID"))); // 求救者的设备ID
						flag = false;
					}
				}
			}
	
			// 违规信息
			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")))) {
						// 比较优先级
						int mapTagGrade = 0;
						switch (String.valueOf(areaViolationMap.get("MAP_TAG_TYPE"))) {
						case EbcConstant.area_type_exclusion:
							mapTagGrade = 5;
							break;
						case EbcConstant.area_type_temporariness:
							mapTagGrade = 3;
							break;
						}
	
						if (mapTagGrade == maxMapTagGrade) {
							// 比较进入时长时间
							long inAreaLong = simpleDateFormat.parse(String.valueOf(areaViolationMap.get("IN_DATE")))
									.getTime();
							if (inAreaLong < minInAreaLong) {
								minInAreaLong = inAreaLong;
								areaInfoMap = areaViolationMap;
							}
						} else if (mapTagGrade > maxMapTagGrade) {
							maxMapTagGrade = mapTagGrade;
							minInAreaLong = simpleDateFormat.parse(String.valueOf(areaViolationMap.get("IN_DATE")))
									.getTime();
							areaInfoMap = areaViolationMap;
						}
					}
				}
	
				// 判断是否违规
				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);// 定位状态
						}
					}
					map.put("fixedLong", String.valueOf(fixedLong));// 停留时长
				}
			}
		}
	
		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>();
		String beginTime = null;// 开始时间
		String endTime = null;// 结束时间
		
		// 时间段类型
		switch (String.valueOf(params.get("timeType")) {
		case EbcConstant.locus_time_interval_tenMinute:
			// 10分钟
			endTime = TimeUtil.getSysTime();
			beginTime = DateUtil.dateAddMinute(endTime, -10);
			break;
		case EbcConstant.locus_time_interval_oneHour:
			// 1小时
			endTime = TimeUtil.getSysTime();
			beginTime = DateUtil.dateAddHour(endTime, -1);
			break;
		case EbcConstant.locus_time_interval_oneDay:
			// 1天
			endTime = TimeUtil.getSysTime();
			beginTime = DateUtil.dateAddDay(endTime, -1);
			break;
		case EbcConstant.locus_time_interval_custom:
			// 自定义
			beginTime = String.valueOf(params.get("beginTime");
			endTime = String.valueOf(params.get("endTime");
			if (beginTime == null || "".equals(beginTime) || endTime == null || "".equals(endTime)) {
				resultMap<String,Object>.put("result", false);
				resultMap<String,Object>.put("errMsg", "日期不能为空");
				return resultMap<String,Object>;
			}
			break;
		default:
			resultMap<String,Object>.put("result", false);
			resultMap<String,Object>.put("errMsg", "时间段无效");
			return resultMap<String,Object>;
		}
		
		Map<String, String> paramsMap = new HashMap<String, String>();
		paramsMap.put("resourceId", String.valueOf(params.get("deviceId"));// 终端ID
		paramsMap.put("startTime", beginTime);
		paramsMap.put("endTime", endTime);
		
		resultMap<String,Object> = deviceManageDao.queryOneDeviceLocationInfo(paramsMap, pageNum, pageSize);
		return resultMap<String,Object>;
		return null;
	}*/
}

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

@@ -4,10 +4,9 @@ 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.PageBean;
import com.ai.bss.location.rescue.dao.interfaces.EquipmentManageDao;
import com.ai.bss.components.common.model.PageInfo;
import com.ai.bss.location.rescue.service.interfaces.EquipmentManageService;
import java.util.*;
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;
@@ -17,118 +16,57 @@ 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 implements EquipmentManageService {
	Logger logger = LoggerFactory.getLogger(EquipmentManageServiceImpl.class);
	@Autowired
	EquipmentManageDao equipmentManageDao;
	@Autowired
	ResourceToolCommand resourceToolCommand;
	@Autowired
	ResourceToolQuery resourceToolQuery;
	@Override
	public CommonResponse<PageBean<Map<String, Object>>> queryEquipmentInfo(CommonRequest<HashMap<String, Object>> conditionMap) throws Exception {
		return resourceToolQuery.queryWorkToolByConditions(conditionMap);
	}
	@Override
	public Map<String, Object> queryOneEquipmentInfo(Map<String,Object> params) throws Exception{
		return equipmentManageDao.queryOneEquipmentInfo(params);
	}
	
	@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<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 boolean deleteEquipmentsInfo(List<Map<String, Object>> paramsList) throws Exception {
		return equipmentManageDao.deleteEquipmentsInfo(paramsList);
	}
	@Override
	public boolean importEquipmentInfo(List<Map<String, Object>> paramsList) throws Exception {
		return equipmentManageDao.importEquipmentInfo(paramsList);
	}
	@Override
	public List<Map<String, Object>> queryCurrentEquipmentLocationInfo(Map<String,Object> params) throws Exception {
		// 获取所有设备列表
		List<Map<String, Object>> allEquipmentList = equipmentManageDao.queryAllEquipmentInfo(params);
		// 获取已绑定船舶的信息
		//List<Map<String, Object>> bindInfoList = deviceManageDao.queryAllBindShip();
		List<Map<String, Object>> bindInfoList = null;
		if (bindInfoList == null || bindInfoList.isEmpty()) {
			return allEquipmentList;
		}
		// 获取定位信息
		List<String> deviceIdsList = new ArrayList<String>();
		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 = null;
		// 拼接船舶最新的位置信息
		for (Map<String, Object> bindInfoMap : bindInfoList) {
			String code = String.valueOf(bindInfoMap.get("CODE"));
			String deviceId = String.valueOf(bindInfoMap.get("DEVICE_ID"));
			for (Map<String, Object> equipmentMap : allEquipmentList) {
				if (code.equals(String.valueOf(equipmentMap.get("FACILITY_CODE")))) {
					equipmentMap.put("DEVICE_ID", deviceId);// 设备ID
					equipmentMap.put("DEVICE_NO", deviceId);// 设备编码
					for (Map<String, String> deviceLocationInfoMap : deviceLocationInfoList) {
						if (deviceId.equals(deviceLocationInfoMap.get("deviceId"))) {
							equipmentMap.put("LONGITUDE", deviceLocationInfoMap.get("longitude"));// 经度
							equipmentMap.put("LATITUDE", deviceLocationInfoMap.get("latitude"));// 纬度
							equipmentMap.put("NEW_DATE", deviceLocationInfoMap.get("newDate"));// 最新定位时间
							break;
						}
					}
					break;
				}
			}
		}
		return allEquipmentList;
	}
	@Override
	public Map<String, Object> verifyEquipmentInfoRepetition(Map<String,Object> params) throws Exception {
		return equipmentManageDao.verifyEquipmentInfoRepetition(params);
	}
public class EquipmentManageServiceImpl<EquipmentManageDao> implements EquipmentManageService {
    Logger logger = LoggerFactory.getLogger(EquipmentManageServiceImpl.class);
    @Autowired
    ResourceToolCommand resourceToolCommand;
    @Autowired
    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> createEquipmentInfo(CommonRequest<ResourceTool> resourceToolCommonRequest) {
        return resourceToolCommand.createWorkTool(resourceToolCommonRequest);
    }
    @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 List<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);
        CommonResponse<PageInfo<Map<String, Object>>> commonResponse = resourceToolQuery.queryWorkToolByOrgAndBindFlag(commonRequest);
        return commonResponse.getData().getData();
    }
}

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

@@ -1,34 +1,30 @@
package com.ai.bss.location.rescue.service.impl;
import java.util.List;
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.service.api.MapAreaQuery;
import com.ai.bss.position.service.api.outparam.LoadMapViewParam;
import com.ai.bss.work.tool.model.ResourceTool;
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.location.rescue.service.interfaces.LocationManagementService;
import com.ai.bss.worker.model.EmployeeTerminalRelaDto;
import com.ai.bss.worker.service.api.EmployeeTerminalRelaQuery;
@Service
public class LocationManagementServiceImpl implements LocationManagementService {
	Logger logger = LoggerFactory.getLogger(LocationManagementServiceImpl.class);
	@Autowired
	EmployeeTerminalRelaQuery employeeTerminalRelaQuery;
	
	@Override
	public List<EmployeeTerminalRelaDto> queryEmployeeBindDeviceList() {
		  String entityId = "0000"; //TODO 组织id
		  //根据组织编码查询该组织下绑定了终端的人员信息, 组织编码为空查询所有人员
		  CommonRequest<String> param = CommonRequest.<String>builder().data(entityId).build();
		  
		  CommonResponse<List<EmployeeTerminalRelaDto>> commonResponse = employeeTerminalRelaQuery.queryIndividualDevRelaByOrgCode(param);
		
		return commonResponse.getData();
	MapAreaQuery mapAreaQuery;
	/**
	 * 初始化人员定位页面的数据
	 * @return
	 * @throws Exception
	 */
	public CommonResponse<LoadMapViewParam> loadMapLocationView() throws Exception {
		String data = "0";//指定地图集（默认0）
		return mapAreaQuery.loadMapView(new CommonRequest<>(data));
	}
	
}	
}

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

@@ -37,7 +37,7 @@ public class MapTagManageServiceImpl implements MapTagManageService {
	CharacteristicSpecService characteristicSpecService;
	@Override
	public 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"));  //围栏名称模糊查询
@@ -47,35 +47,25 @@ public class MapTagManageServiceImpl implements MapTagManageService {
		CommonRequest<Map<String, Object>> commonRequest = new CommonRequest<Map<String, Object>>(data, pageNumber, pageSize);
		CommonResponse<PageBean<Map<String, Object>>> result = mapAreaTagQuery.queryMapAreaTag(commonRequest);
		return result.getData();
		return mapAreaTagQuery.queryMapAreaTag(commonRequest);
	}
	@Override
	public List<Map<String, Object>> queryListMapTagInfo(Map<String, String> params) throws Exception {
	public CommonResponse<List<Map<String, Object>>> queryAllMapTagByOrg(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);
		CommonResponse<List<Map<String, Object>>> result = mapAreaTagQuery.queryAllMapAreaByConditions(commonRequest);
		return result.getData();
		 return mapAreaTagQuery.queryAllMapAreaByConditions(commonRequest);
	}
	@Override
	public Map<String, Object> queryOneMapTagInfo(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("mapAreaId", params.get("mapTagId")); //根据主键查询
		CommonRequest<Map<String, Object>> commonRequest = new CommonRequest<Map<String, Object>>(data);
		CommonResponse<List<Map<String, Object>>> result = mapAreaTagQuery.queryAllMapAreaByConditions(commonRequest);
		if (CollectionUtils.isEmpty(result.getData())){
			return null;
		}else{
			return result.getData().get(0);
		}
		return mapAreaTagQuery.queryAllMapAreaByConditions(commonRequest);
	}
	@Override
@@ -98,7 +88,7 @@ public class MapTagManageServiceImpl implements MapTagManageService {
	}
	@Override
	public boolean addMapTagInfo(MapTagInfoDto mapTagInfoDto) throws Exception {
	public CommonResponse<Void> addMapTagInfo(MapTagInfoDto mapTagInfoDto) throws Exception {
		mapTagInfoDto.setMapAreaSetId("0"); //TODO 固定值 所属地图围栏集合标识
		mapTagInfoDto.setPriority("10");  //优先级
		mapTagInfoDto.setMapType(MapArea.MAP_TYPE_GEOMETRY);	//围栏形状,GEO多边形, RAD 圆形
@@ -110,13 +100,11 @@ public class MapTagManageServiceImpl implements MapTagManageService {
		//data.setRadius("50");	//区域半径 针对 圆形围栏
		CommonRequest<MapTagInfoDto> param = new CommonRequest<MapTagInfoDto>(mapTagInfoDto);
		CommonResponse<Void> commonResponse = mapAreaTagCommand.createMapAreaTag(param);
		return commonResponse.isSuccess();
		return mapAreaTagCommand.createMapAreaTag(param);
	}
	@Override
	public boolean modifyMapTagInfo(MapTagInfoDto mapTagInfoDto) throws Exception {
	public CommonResponse<Void> modifyMapTagInfo(MapTagInfoDto mapTagInfoDto) throws Exception {
		mapTagInfoDto.setMapAreaSetId("0"); //TODO 固定值 所属地图围栏集合标识
		mapTagInfoDto.setPriority("10");  //优先级
		mapTagInfoDto.setMapType(MapArea.MAP_TYPE_GEOMETRY);	//围栏形状,GEO多边形, RAD 圆形
@@ -129,16 +117,14 @@ public class MapTagManageServiceImpl implements MapTagManageService {
		//data.setRadius("50");
		CommonRequest<MapTagInfoDto> param = new CommonRequest<MapTagInfoDto>(mapTagInfoDto);
		CommonResponse<Void> commonResponse = mapAreaTagCommand.modifyMapAreaTag(param);
		return commonResponse.isSuccess();
		return mapAreaTagCommand.modifyMapAreaTag(param);
	}
	@Override
	public boolean deleteMapTagInfo(List<String> mapTagIdsList) throws Exception {
	public CommonResponse<Void> deleteMapTagInfo(List<String> mapTagIdsList) throws Exception {
		CommonRequest<List<String>> param = new CommonRequest<List<String>>(mapTagIdsList);
		CommonResponse<Void> commonResponse = mapAreaTagCommand.deleteMapArea(param);
		return commonResponse.isSuccess();
		return mapAreaTagCommand.deleteMapArea(param);
	}
}

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

@@ -5,6 +5,8 @@ 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;
@@ -41,18 +43,19 @@ public class WorkEmployeeServiceImpl implements WorkEmployeeService {
	@Autowired
	CharacteristicSpecService characteristicSpecService;
    @Override
    public PageBean<UserDto> queryWorkEmployee(CommonRequest<UserDto> request) throws Exception {
        CommonResponse<PageBean<UserDto>> result = userDtoQuery.queryWorkEmployee(request);
    @Autowired
    EmployeeTerminalRelaQuery employeeTerminalRelaQuery;
        return result.getData();
    @Override
    public CommonResponse<PageBean<UserDto>> queryWorkEmployee(CommonRequest<UserDto> request) throws Exception {
        // TODO 组织编码
        request.getData().setOrgCode("0000");
        return userDtoQuery.queryWorkEmployee(request);
    }
    @Override
    public List<Organization> queryAllOrganize(CommonRequest<Organization> params) throws Exception {
        CommonResponse<List<Organization>> result = organizationQuery.queryAllOrganize(params);
        return result.getData();
    public CommonResponse<List<Organization>> queryAllOrganize(CommonRequest<Organization> params) throws Exception {
        return organizationQuery.queryAllOrganize(params);
    }
    @Override
@@ -96,4 +99,12 @@ public class WorkEmployeeServiceImpl implements WorkEmployeeService {
        return success;
    }
    @Override
    public CommonResponse<List<EmployeeTerminalRelaDto>> queryEmployeeBindDeviceList() {
        String entityId = "0000"; //TODO 组织id
        //根据组织编码查询该组织下绑定了终端的人员信息, 组织编码为空查询所有人员
        CommonRequest<String> param = CommonRequest.<String>builder().data(entityId).build();
        return employeeTerminalRelaQuery.queryIndividualDevRelaByOrgCode(param);
    }
}

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

@@ -1,13 +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.sun.org.apache.xpath.internal.objects.XString;
import org.springframework.web.bind.annotation.RequestBody;
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
public interface DeviceManageService {
	/**
@@ -18,7 +16,7 @@ public interface DeviceManageService {
	 * @return
	 * @throws Exception
	 */
	Map<String, Object> queryPageDeviceInfo(Map<String, String> params, int pageNumber, int pageSize) throws Exception;
	PageInfo<Map<String, Object>> queryPageDeviceInfo(Map<String, String> params, int pageNumber, int pageSize) throws Exception;
	/**
	 * 获取终端类型下拉列表
@@ -64,11 +62,11 @@ public interface DeviceManageService {
	/**
	* 绑定终端
	* @param params
	* @param type
	* @param params
	* @return
	* @throws Exception
	*/
	boolean bindDevice(Map<String, String> params) throws Exception;
	CommonResponse<Void> bindDevice(Map<String, String> params) throws Exception;
	/**
	 * 查询绑定关系信息
@@ -84,7 +82,7 @@ public interface DeviceManageService {
	* @return
	* @throws Exception
	*/
	boolean unbindDevice(Map<String, String> params) throws Exception;
	CommonResponse<Void> unbindDevice(Map<String, String> params) throws Exception;
	/**
	* 获取人员或船舶的下拉列表数据
@@ -94,38 +92,4 @@ public interface DeviceManageService {
	*/
	List<? extends Object> queryAssociatInfo(Map<String, Object> params) 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;
	
	*/
	/*
	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/interfaces/EquipmentManageService.java

@@ -14,21 +14,13 @@ public interface EquipmentManageService {
    CommonResponse<PageBean<Map<String, Object>>> queryEquipmentInfo(CommonRequest<HashMap<String, Object>> conditionMap) throws Exception;
    
    Map<String, Object> queryOneEquipmentInfo(Map<String,Object> params) throws Exception;
    CommonResponse<ResourceTool> modifyEquipmentInfo(CommonRequest<ResourceTool> resourceToolCommonRequest) throws Exception;
    CommonResponse<ResourceTool> deleteEquipmentInfo(CommonRequest<List<String>> resourceToolCommonRequest) throws Exception;
    boolean deleteEquipmentsInfo(List<Map<String, Object>> paramsList) throws Exception;
    boolean importEquipmentInfo(List<Map<String, Object>> paramsList) throws Exception;
    List<Map<String, Object>> queryCurrentEquipmentLocationInfo(Map<String,Object> params) throws Exception;
    
    Map<String, Object> verifyEquipmentInfoRepetition(Map<String,Object> params) throws Exception;
    CommonResponse<ResourceTool> createEquipmentInfo(CommonRequest<ResourceTool> resourceToolCommonRequest);
    CommonResponse<List<ResourceToolType>> loadAllResourceToolType(CommonRequest commonRequest);
    List<Map<String, Object>> queryAllEquipmentNotBind() throws Exception;
}

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

@@ -2,6 +2,8 @@ package com.ai.bss.location.rescue.service.interfaces;
import java.util.List;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.position.service.api.outparam.LoadMapViewParam;
import com.ai.bss.worker.model.EmployeeTerminalRelaDto;
/**
@@ -11,10 +13,11 @@ import com.ai.bss.worker.model.EmployeeTerminalRelaDto;
 */
public interface LocationManagementService {
	/**
	 * 获取已绑定终端的人员列表
	 * @return
	 */
	List<EmployeeTerminalRelaDto> queryEmployeeBindDeviceList();
    /**
     * 初始化人员定位页面的数据
     * @return
     * @throws Exception
     */
    CommonResponse<LoadMapViewParam> loadMapLocationView() throws Exception;
}

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

@@ -3,6 +3,7 @@ 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.components.common.model.PageBean;
import com.ai.bss.worker.model.MapTagInfoDto;
@@ -16,14 +17,14 @@ public interface MapTagManageService {
	 * @return
	 * @throws Exception
	 */
	PageBean<Map<String, Object>> queryPageMapTagInfo(Map<String, String> params, int pageNumber, int pageSize) throws Exception;
	CommonResponse<PageBean<Map<String, Object>>> queryPageMapTagInfo(Map<String, String> params, int pageNumber, int pageSize) throws Exception;
	/**
	 * 获取所有围栏信息
	 * 按部门查询所有围栏信息
	 * @return
	 * @throws Exception
	 */
	List<Map<String, Object>> queryListMapTagInfo(Map<String, String> params) throws Exception;
	CommonResponse<List<Map<String, Object>>> queryAllMapTagByOrg(Map<String, String> params) throws Exception;
	/**
	 * 获取单个围栏信息
@@ -31,7 +32,7 @@ public interface MapTagManageService {
	 * @return
	 * @throws Exception
	 */
	Map<String, Object> queryOneMapTagInfo(Map<String, String> params) throws Exception;
	CommonResponse<List<Map<String, Object>>> queryOneMapTagInfo(Map<String, String> params) throws Exception;
	/**
	 * 获取围栏类型下拉列表
@@ -45,7 +46,7 @@ public interface MapTagManageService {
	 * @return
	 * @throws Exception
	 */
	boolean addMapTagInfo(MapTagInfoDto mapTagInfoDto) throws Exception;
	CommonResponse<Void> addMapTagInfo(MapTagInfoDto mapTagInfoDto) throws Exception;
	/**
	 * 修改围栏信息
@@ -53,7 +54,7 @@ public interface MapTagManageService {
	 * @return
	 * @throws Exception
	 */
	boolean modifyMapTagInfo(MapTagInfoDto mapTagInfoDto) throws Exception;
	CommonResponse<Void> modifyMapTagInfo(MapTagInfoDto mapTagInfoDto) throws Exception;
	/**
	 * 删除围栏信息
@@ -61,6 +62,6 @@ public interface MapTagManageService {
	 * @return
	 * @throws Exception
	 */
	boolean deleteMapTagInfo(List<String> mapTagIdsList) throws Exception;
	CommonResponse<Void> deleteMapTagInfo(List<String> mapTagIdsList) throws Exception;
}

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

@@ -10,14 +10,21 @@ 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 {
	PageBean<UserDto> queryWorkEmployee(CommonRequest<UserDto> request) throws Exception;
	/**
	 * 人员列表分页查询
	 * @param request
	 * @return
	 * @throws Exception
	 */
	CommonResponse<PageBean<UserDto>> queryWorkEmployee(CommonRequest<UserDto> request) throws Exception;
	List<Organization> queryAllOrganize(CommonRequest<Organization> params) throws Exception;
	CommonResponse<List<Organization>> queryAllOrganize(CommonRequest<Organization> params) throws Exception;
	/**
	 * 获取职务下拉列表
@@ -28,4 +35,10 @@ public interface WorkEmployeeService {
	boolean createWorkEmployee(EmployeeDto employeeDto) throws Exception;
	boolean deleteWorkEmployee(List<EmployeeDto> employeeDtoList);
	/**
	 * 获取已绑定终端的人员列表
	 * @return
	 */
	CommonResponse<List<EmployeeTerminalRelaDto>> queryEmployeeBindDeviceList();
}

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

@@ -45,9 +45,12 @@ public class EbcConstant {
	//静态常量: 围栏类型
	public static final String BUSINESS_SPEC_EMPLOYEE_POSITION="mainJobPosition";
		
	
	
	
	//工具是否可绑定：不可绑定
	public static final String TOOL_BIND_REJECT="0";
	//工具是否可绑定：可绑定
	public static final String TOOL_BIND_ALLOW="1";