Merge remote-tracking branch 'origin/master'

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

@@ -172,6 +172,10 @@ public class DeviceManageController {
			result.put("result", true);
		} else {
			result.put("result", false);
			if ("只有注册或停用状态的设备才能删除！".equals(String.valueOf(resultMap.get("resultMsg")))){
				resultMap.put("resultMsg","终端已上传数据");
			}
			result.put("errMsg", "删除失败:" + resultMap.get("resultMsg"));
		}

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

@@ -4,10 +4,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ai.abc.api.model.CommonRequest;
import com.ai.bss.location.rescue.util.EbcConstant;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -34,21 +37,16 @@ public class MapTagManageController {
	 */
	@ResponseBody
	@RequestMapping("/queryPageMapTagInfo")
	public Map<String,Object> queryPageMapTagInfo(Map<String,Object> params) throws Exception {
	public Map<String,Object> queryPageMapTagInfo(@RequestBody CommonRequest<Map<String, String>> request) throws Exception {
		// 当前页数
		//int pageNum = Integer.parseInt(params.get("pageNum") < 1 ? 1 : Integer.parseInt(params.get("pageNum");
		int pageNumber = request.getPageNumber() < 1 ? 1 : request.getPageNumber();
		// 每页条数
		//int pageSize = Integer.parseInt(params.get("pageSize") < 1 ? EbcConstant.default_page_size : Integer.parseInt(params.get("pageSize");
		int pageSize = request.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE : request.getPageSize();
		// 当前页数
		int pageNum = Integer.parseInt(String.valueOf(params.get("pageNum")));
		// 每页条数
		int pageSize = Integer.parseInt(String.valueOf(params.get("pageSize")));
				
		Map<String,Object> result = mapTagManageService.queryPageMapTagInfo(params, pageNum, pageSize);
		Map<String,Object> result = mapTagManageService.queryPageMapTagInfo(request.getData(), pageNumber, pageSize);
		result.put("pageNum", pageNum);
		result.put("pageNum", pageNumber);
		result.put("pageSize", pageSize);
		return result;
	}
@@ -62,7 +60,7 @@ public class MapTagManageController {
	 */
	@ResponseBody
	@RequestMapping("/queryAllMapTagInfo")
	public Map<String,Object> queryAllMapTagInfo(Map<String,Object> params) throws Exception {
	public Map<String,Object> queryAllMapTagInfo(Map<String,String> params) throws Exception {
		Map<String,Object> result = new HashMap<String,Object>();
		List<Map<String, Object>> resultList = mapTagManageService.queryListMapTagInfo(params);
@@ -79,7 +77,7 @@ public class MapTagManageController {
	 */
	@ResponseBody
	@RequestMapping("/queryOneMapTagInfo")
	public Map<String,Object> queryOneMapTagInfo(Map<String,Object> params) throws Exception {
	public Map<String,Object> queryOneMapTagInfo(Map<String,String> params) throws Exception {
		Map<String,Object> result = new HashMap<String,Object>();
		if (params == null || params.get("mapTagId") == null) {
@@ -102,7 +100,7 @@ public class MapTagManageController {
	 */
	@ResponseBody
	@RequestMapping("/addMapTagInfo")
	public Map<String,Object> addMapTagInfo(Map<String,Object> params) throws Exception {
	public Map<String,Object> addMapTagInfo(Map<String,String> params) throws Exception {
		Map<String,Object> result = new HashMap<String,Object>();
		if (params == null || params.get("mapTagName") == null || params.get("mapTagType") == null
@@ -127,7 +125,7 @@ public class MapTagManageController {
	 */
	@ResponseBody
	@RequestMapping("/modifyMapTagInfo")
	public Map<String,Object> modifyMapTagInfo(Map<String,Object> params) throws Exception {
	public Map<String,Object> modifyMapTagInfo(Map<String,String> params) throws Exception {
		Map<String,Object> result = new HashMap<String,Object>();
		if (params == null || params.get("mapTagId") == null || params.get("mapTagName") == null
@@ -151,7 +149,7 @@ public class MapTagManageController {
	 */
	@ResponseBody
	@RequestMapping("/deleteMapTagInfo")
	public Map<String,Object> deleteMapTagInfo(Map<String,Object> params) throws Exception {
	public Map<String,Object> deleteMapTagInfo(Map<String,String> params) throws Exception {
		Map<String,Object> result = new HashMap<String,Object>();
		if (params == null || params.get("mapTagId") == null) {

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

@@ -1,9 +1,6 @@
package com.ai.bss.location.rescue.service.impl;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.user.dto.UserDto;
@@ -352,11 +349,7 @@ public class DeviceManageServiceImpl implements DeviceManageService {
	@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);
		}
		List<String> deviceIdList = Arrays.asList(params.get("deviceId").split(","));
		// 根据终端id删除终端关联信息
		CommonResponse deleteRelaResult = resourceToolCommand

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

@@ -2,7 +2,6 @@ package com.ai.bss.location.rescue.service.impl;
import com.ai.bss.location.rescue.dao.interfaces.MapTagManageDao;
import com.ai.bss.location.rescue.service.interfaces.MapTagManageService;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -16,33 +15,33 @@ public class MapTagManageServiceImpl implements MapTagManageService {
	MapTagManageDao mapTagManageDao;
	@Override
	public Map<String,Object> queryPageMapTagInfo(Map<String,Object> params, int pageNum, int pageSize) throws Exception {
		return mapTagManageDao.queryPageMapTagInfo(params, pageNum,pageSize);
	public Map<String,Object> queryPageMapTagInfo(Map<String,String> params, int pageNumber, int pageSize) throws Exception {
		return null;
	}
	@Override
	public List<Map<String, Object>> queryListMapTagInfo(Map<String,Object> params) throws Exception {
		return mapTagManageDao.queryListMapTagInfo(params);
	public List<Map<String, Object>> queryListMapTagInfo(Map<String,String> params) throws Exception {
		return null;
	}
	@Override
	public Map<String, Object> queryOneMapTagInfo(Map<String,Object> params) throws Exception {
		return mapTagManageDao.queryOneMapTagInfo(params);
	public Map<String, Object> queryOneMapTagInfo(Map<String,String> params) throws Exception {
		return null;
	}
	@Override
	public boolean addMapTagInfo(Map<String,Object> params) throws Exception {
		return mapTagManageDao.addMapTagInfo(params);
	public boolean addMapTagInfo(Map<String,String> params) throws Exception {
		return false;
	}
	@Override
	public boolean modifyMapTagInfo(Map<String,Object> params) throws Exception {
		return mapTagManageDao.modifyMapTagInfo(params);
	public boolean modifyMapTagInfo(Map<String,String> params) throws Exception {
		return false;
	}
	@Override
	public boolean deleteMapTagInfo(Map<String,Object> params) throws Exception {
		return mapTagManageDao.deleteMapTagInfo(params);
	public boolean deleteMapTagInfo(Map<String,String> params) throws Exception {
		return false;
	}
}

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

@@ -8,12 +8,12 @@ public interface MapTagManageService {
	/**
	 * 分页查询围栏信息
	 * @param params
	 * @param pageNum 当前页数
	 * @param pageNumber 当前页数
	 * @param pageSize 每页条数
	 * @return
	 * @throws Exception
	 */
	Map<String, Object> queryPageMapTagInfo(Map<String, Object> params, int pageNum, int pageSize) throws Exception;
	Map<String, Object> queryPageMapTagInfo(Map<String, String> params, int pageNumber, int pageSize) throws Exception;
	/**
	 * 获取所有围栏信息
@@ -21,7 +21,7 @@ public interface MapTagManageService {
	 * @return
	 * @throws Exception
	 */
	List<Map<String, Object>> queryListMapTagInfo(Map<String, Object> params) throws Exception;
	List<Map<String, Object>> queryListMapTagInfo(Map<String, String> params) throws Exception;
	/**
	 * 获取单个围栏信息
@@ -29,7 +29,7 @@ public interface MapTagManageService {
	 * @return
	 * @throws Exception
	 */
	Map<String, Object> queryOneMapTagInfo(Map<String, Object> params) throws Exception;
	Map<String, Object> queryOneMapTagInfo(Map<String, String> params) throws Exception;
	/**
	 * 新增围栏信息
@@ -37,7 +37,7 @@ public interface MapTagManageService {
	 * @return
	 * @throws Exception
	 */
	boolean addMapTagInfo(Map<String, Object> params) throws Exception;
	boolean addMapTagInfo(Map<String, String> params) throws Exception;
	/**
	 * 修改围栏信息
@@ -45,7 +45,7 @@ public interface MapTagManageService {
	 * @return
	 * @throws Exception
	 */
	boolean modifyMapTagInfo(Map<String, Object> params) throws Exception;
	boolean modifyMapTagInfo(Map<String, String> params) throws Exception;
	/**
	 * 删除围栏信息
@@ -53,6 +53,6 @@ public interface MapTagManageService {
	 * @return
	 * @throws Exception
	 */
	boolean deleteMapTagInfo(Map<String, Object> params) throws Exception;
	boolean deleteMapTagInfo(Map<String, String> params) throws Exception;
}