修改地图标记类型和设备类型

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

@@ -1,10 +1,13 @@
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.PageBean;
import com.ai.bss.components.common.model.PageInfo;
import com.ai.bss.location.rescue.service.interfaces.EquipmentManageService;
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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -13,13 +16,9 @@ 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.model.PageBean;
import com.ai.bss.location.rescue.service.interfaces.EquipmentManageService;
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 java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * 设备管理
@@ -27,81 +26,82 @@ import com.ai.bss.work.tool.model.ResourceToolType;
@Controller
@RequestMapping("/equipment")
public class EquipmentManageController {
	Logger logger = LoggerFactory.getLogger(EquipmentManageController.class);
	@Autowired
	EquipmentManageService equipmentManageService;
	/**
	 * 分页查询设备信息
	 *
	 * @return
	 */
	@ResponseBody
	@RequestMapping("/queryEquipmentInfo")
	public CommonResponse<PageBean<Map<String, Object>>> queryEquipmentInfo(@RequestBody CommonRequest<HashMap<String, Object>> conditionMap) throws Exception {
		// 当前页数
		int pageNumber = conditionMap.getPageNumber() < 1 ? 1 : conditionMap.getPageNumber();
		// 每页条数
		int pageSize = conditionMap.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE : conditionMap.getPageSize();
		conditionMap.setPageSize(pageSize);
		conditionMap.setPageNumber(pageNumber);
		conditionMap.getData().put("workOrgId","0000");
		return equipmentManageService.queryEquipmentInfo(conditionMap);
	}
	/**
	 * 编辑设备信息
	 */
	@ResponseBody
	@RequestMapping("/modifyEquipmentInfo")
	public CommonResponse<ResourceTool> modifyEquipmentInfo(@RequestBody CommonRequest<ResourceTool> resourceToolCommonRequest) throws Exception {
		resourceToolCommonRequest.getData().setWorkOrgId("0000");
		return equipmentManageService.modifyEquipmentInfo(resourceToolCommonRequest);
	}
	/**
	 * 新增设备信息
	 */
	@ResponseBody
	@RequestMapping("/createEquipmentInfo")
	public CommonResponse<ResourceTool> createEquipmentInfo(@RequestBody CommonRequest<ResourceTool> resourceToolCommonRequest) throws Exception {
		resourceToolCommonRequest.getData().setWorkOrgId("0000");
		CommonResponse<ResourceTool> commonResponse	= equipmentManageService.createEquipmentInfo(resourceToolCommonRequest);
		return commonResponse;
	}
	/**
	 * 删除设备信息
	 */
	@ResponseBody
	@RequestMapping("/deleteEquipmentInfo")
	public CommonResponse<ResourceTool> deleteEquipmentInfo(@RequestBody CommonRequest<List<String>> resourceToolCommonRequest) throws Exception {
		return	 equipmentManageService.deleteEquipmentInfo(resourceToolCommonRequest);
	}
	/**
	 * 获取所有设备类型
	 */
	@ResponseBody
	@RequestMapping("/loadAllResourceToolType")
	public CommonResponse<List<ResourceToolType>>  loadAllResourceToolType(@RequestBody CommonRequest commonRequest) throws Exception {
		return	 equipmentManageService.loadAllResourceToolType(commonRequest);
	}
	/**
	 * 获取所有未绑定的设备
	 */
	@ResponseBody
	@RequestMapping("/queryAllEquipmentNotBind")
	public CommonResponse<PageInfo<Map<String, Object>>> queryAllEquipmentNotBind() throws Exception {
		Map<String, Object> result = new HashMap<String, Object>();
		return equipmentManageService.queryAllEquipmentNotBind();
	}
    Logger logger = LoggerFactory.getLogger(EquipmentManageController.class);
    @Autowired
    EquipmentManageService equipmentManageService;
    /**
     * 分页查询设备信息
     *
     * @return
     */
    @ResponseBody
    @RequestMapping("/queryEquipmentInfo")
    public CommonResponse<PageBean<Map<String, Object>>> queryEquipmentInfo(@RequestBody CommonRequest<HashMap<String, Object>> conditionMap) throws Exception {
        // 当前页数
        int pageNumber = conditionMap.getPageNumber() < 1 ? 1 : conditionMap.getPageNumber();
        // 每页条数
        int pageSize = conditionMap.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE : conditionMap.getPageSize();
        conditionMap.setPageSize(pageSize);
        conditionMap.setPageNumber(pageNumber);
        conditionMap.getData().put("workOrgId", "0000");
        return equipmentManageService.queryEquipmentInfo(conditionMap);
    }
    /**
     * 编辑设备信息
     */
    @ResponseBody
    @RequestMapping("/modifyEquipmentInfo")
    public CommonResponse<ResourceTool> modifyEquipmentInfo(@RequestBody CommonRequest<ResourceTool> resourceToolCommonRequest) throws Exception {
        resourceToolCommonRequest.getData().setWorkOrgId("0000");
        return equipmentManageService.modifyEquipmentInfo(resourceToolCommonRequest);
    }
    /**
     * 新增设备信息
     */
    @ResponseBody
    @RequestMapping("/createEquipmentInfo")
    public CommonResponse<ResourceTool> createEquipmentInfo(@RequestBody CommonRequest<ResourceTool> resourceToolCommonRequest) throws Exception {
        resourceToolCommonRequest.getData().setWorkOrgId("0000");
        CommonResponse<ResourceTool> commonResponse = equipmentManageService.createEquipmentInfo(resourceToolCommonRequest);
        return commonResponse;
    }
    /**
     * 删除设备信息
     */
    @ResponseBody
    @RequestMapping("/deleteEquipmentInfo")
    public CommonResponse<ResourceTool> deleteEquipmentInfo(@RequestBody CommonRequest<List<String>> resourceToolCommonRequest) throws Exception {
        return equipmentManageService.deleteEquipmentInfo(resourceToolCommonRequest);
    }
    /**
     * 获取所有设备类型
     */
    @ResponseBody
    @RequestMapping("/loadAllResourceToolType")
    public CommonResponse<List<ResourceToolType>> loadAllResourceToolType() throws Exception {
        CommonRequest commonRequest = new CommonRequest(null);
        return equipmentManageService.loadAllResourceToolType(commonRequest);
    }
    /**
     * 获取所有未绑定的设备
     */
    @ResponseBody
    @RequestMapping("/queryAllEquipmentNotBind")
    public CommonResponse<PageInfo<Map<String, Object>>> queryAllEquipmentNotBind() throws Exception {
        Map<String, Object> result = new HashMap<String, Object>();
        return equipmentManageService.queryAllEquipmentNotBind();
    }

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

@@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.Map;
/**
 * 人员定位管理
 * @author konghl@asiainfo.com
@@ -24,28 +26,13 @@ public class LocationManagementController {
	LocationManagementServiceImpl locationManagementServiceImpl;
	/**
	 * 推送镜屏数据测试
	 * @param msg
	 * @return
	 */
	@ResponseBody
	@RequestMapping(value = "/mirrorSendDataTest", method = RequestMethod.POST)
	public String mirrorSendDataTest(@RequestBody String msg) {
		MirrorSendDateUtil.sendData(MirrorSendDateUtil.topic_personnel, msg);
		return msg;
	}
	/**
	 * 初始化人员定位页面的数据
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/loadMapLocationView")
	public CommonResponse<LoadMapViewParam> loadMapLocationView() throws Exception {
	public CommonResponse<Map<String,Object>> loadMapLocationView() throws Exception {
		return locationManagementServiceImpl.loadMapLocationView();
	}

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

@@ -5,6 +5,7 @@ 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.position.model.MapAreaBusinessType;
import com.ai.bss.worker.model.MapTagInfoDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -77,18 +78,14 @@ public class MapTagManageController {
    }
    /**
     * 获取围栏类型下拉列表
     * 获取所有围栏类型
     *
     * @return
     */
    @ResponseBody
    @RequestMapping("/queryMapAreaTypeList")
    public CommonResponse<List<Map<String, String>>> queryMapAreaTypeList() {
        List<Map<String, String>> resultList = mapTagManageService.queryMapAreaTypeList();
        CommonResponse<List<Map<String,String>>> commonResponse=CommonResponse.ok(resultList);
        return commonResponse;
    public CommonResponse<List<MapAreaBusinessType>> queryMapAreaTypeList() {
       return mapTagManageService.queryMapAreaTypeList();
    }
    /**

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

@@ -3,16 +3,24 @@ 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.location.rescue.service.interfaces.LocationManagementService;
import com.ai.bss.location.rescue.util.MirrorSendDateUtil;
import com.ai.bss.position.model.EntityPosition;
import com.ai.bss.position.model.MapArea;
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 com.ai.bss.worker.service.api.EntityPositionChangeHandle;
import com.alibaba.fastjson.JSON;
import org.slf4j.Logger;
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 LocationManagementServiceImpl implements LocationManagementService {
public class LocationManagementServiceImpl implements LocationManagementService, EntityPositionChangeHandle {
	Logger logger = LoggerFactory.getLogger(LocationManagementServiceImpl.class);
	@Autowired
@@ -23,8 +31,38 @@ public class LocationManagementServiceImpl implements LocationManagementService
	 * @return
	 * @throws Exception
	 */
	public CommonResponse<LoadMapViewParam> loadMapLocationView() throws Exception {
	public CommonResponse<Map<String,Object>> loadMapLocationView() throws Exception {
		String data = "0";//指定地图集（默认0）
		return mapAreaQuery.loadMapView(new CommonRequest<>(data));
		CommonResponse<LoadMapViewParam> LoadMapViewParamCommonResponse= mapAreaQuery.loadMapView(new CommonRequest<>(data));
		List<MapArea> mapAreaList= LoadMapViewParamCommonResponse.getData().getAggregatedMapAreaList();
		List<EntityPosition> entityPosition =LoadMapViewParamCommonResponse.getData().getUnaggregatedEntityPositionList();
		Map<String,Object> resultMap=new HashMap<String,Object>();
		resultMap.put("aggregatedMapAreaList",mapAreaList);
		resultMap.put("unaggregatedEntityPositionList",entityPosition);
		//resultMap.put("countMap",countMap);
		CommonResponse<Map<String,Object>> resultCommonResponse=new CommonResponse<Map<String,Object>>();
		return resultCommonResponse;
	}
	/**
	 * 镜屏推送实体位置变动信息
	 * @param commonRequest
	 * @return
	 */
	@Override
	public CommonResponse<Map<String, Object>> entityPositionChange(CommonRequest<LoadMapViewParam> commonRequest) {
		String msg= JSON.toJSONString(CommonResponse.ok(commonRequest.getData()));
		MirrorSendDateUtil.sendData(MirrorSendDateUtil.topic_personnel, msg);
		return null;
	}
}

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

@@ -9,6 +9,8 @@ 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.position.model.MapArea;
import com.ai.bss.position.model.MapAreaBusinessType;
import com.ai.bss.position.service.api.MapAreaQuery;
import com.ai.bss.user.dto.UserDto;
import com.ai.bss.user.service.api.UserDtoQuery;
import com.ai.bss.worker.model.MapTagInfoDto;
@@ -34,6 +36,9 @@ public class MapTagManageServiceImpl implements MapTagManageService {
	private MapAreaTagQuery mapAreaTagQuery;
	@Autowired
	private MapAreaQuery mapAreaQuery;
	@Autowired
	CharacteristicSpecService characteristicSpecService;
	@Override
@@ -69,22 +74,9 @@ public class MapTagManageServiceImpl implements MapTagManageService {
	}
	@Override
	public List<Map<String,String>> queryMapAreaTypeList() {
		CharacteristicSpec characteristicSpec = characteristicSpecService
				.findBusinessSpecByCharSpecCode(EbcConstant.BUSINESS_SPEC_MAP_AREA_TYPE);
		if (characteristicSpec == null) {
			return new ArrayList<Map<String,String>>();
		}
		List<Map<String,String>> resultList=new ArrayList<Map<String,String>>();
		for (CharacteristicSpecValue characteristicSpecValue:characteristicSpec.getCharacteristicSpecValues()) {
			Map<String,String> map=new HashMap<String,String>();
			map.put("mapAreaTypeId",characteristicSpecValue.getCode());
			map.put("mapAreaTypeName",characteristicSpecValue.getValue());
			resultList.add(map);
		}
		return resultList;
	public CommonResponse<List<MapAreaBusinessType>> queryMapAreaTypeList() {
		CommonRequest var1=new CommonRequest(null);
		return mapAreaQuery.queryAllMapAreaBusinessType(var1);
	}
	@Override

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

@@ -1,9 +1,5 @@
package com.ai.bss.location.rescue.service.interfaces;
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.PageBean;
@@ -11,10 +7,14 @@ import com.ai.bss.components.common.model.PageInfo;
import com.ai.bss.work.tool.model.ResourceTool;
import com.ai.bss.work.tool.model.ResourceToolType;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public interface EquipmentManageService {
    CommonResponse<PageBean<Map<String, Object>>> queryEquipmentInfo(CommonRequest<HashMap<String, Object>> conditionMap) throws Exception;
    
    CommonResponse<ResourceTool> modifyEquipmentInfo(CommonRequest<ResourceTool> resourceToolCommonRequest) throws Exception;
    CommonResponse<ResourceTool> deleteEquipmentInfo(CommonRequest<List<String>> resourceToolCommonRequest) throws Exception;
@@ -23,5 +23,5 @@ public interface EquipmentManageService {
    CommonResponse<List<ResourceToolType>> loadAllResourceToolType(CommonRequest commonRequest);
    CommonResponse<PageInfo<Map<String, Object>>>queryAllEquipmentNotBind() throws Exception;
    CommonResponse<PageInfo<Map<String, Object>>> queryAllEquipmentNotBind() throws Exception;
}

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

@@ -1,6 +1,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.position.service.api.outparam.LoadMapViewParam;
@@ -18,6 +19,6 @@ public interface LocationManagementService {
     * @return
     * @throws Exception
     */
    CommonResponse<LoadMapViewParam> loadMapLocationView() throws Exception;
    CommonResponse<Map<String,Object>> loadMapLocationView() throws Exception;
}

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

@@ -5,6 +5,7 @@ import java.util.Map;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.position.model.MapAreaBusinessType;
import com.ai.bss.worker.model.MapTagInfoDto;
public interface MapTagManageService {
@@ -35,10 +36,10 @@ public interface MapTagManageService {
	CommonResponse<List<Map<String, Object>>> queryOneMapTagInfo(Map<String, String> params) throws Exception;
	/**
	 * 获取围栏类型下拉列表
	 * 获取所有围栏类型
	 * @return
	 */
	List<Map<String,String>> queryMapAreaTypeList();
	CommonResponse<List<MapAreaBusinessType>> queryMapAreaTypeList();
	/**
	 * 新增围栏信息