设备管理模块后台修改

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

@@ -6,9 +6,11 @@ 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.work.tool.model.ResourceTool;
import com.ai.bss.work.tool.model.ResourceToolType;
import com.alibaba.fastjson.TypeReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,12 +34,13 @@ public class EquipmentManageController {
	/**
	 * 分页查询设备信息
	 *
	 * @return
	 */
	@ResponseBody
	@RequestMapping("/queryEquipmentInfo")
	public CommonResponse<PageInfo<Map<String, Object>>> queryEquipmentInfo(CommonRequest<HashMap<String, Object>> conditionMap) throws Exception {
		conditionMap.getData().put("workOrgId","0000");
	public CommonResponse<PageBean<Map<String, Object>>> queryEquipmentInfo(@RequestBody CommonRequest<HashMap<String, Object>> conditionMap) throws Exception {
		conditionMap.getData().put("workOrgId","20");
		return equipmentManageService.queryEquipmentInfo(conditionMap);
	}

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

@@ -3,7 +3,7 @@ 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.PageInfo;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.location.rescue.dao.interfaces.DeviceManageDao;
import com.ai.bss.location.rescue.dao.interfaces.EquipmentManageDao;
import com.ai.bss.location.rescue.service.interfaces.EquipmentManageService;
@@ -38,10 +38,8 @@ public class EquipmentManageServiceImpl implements EquipmentManageService {
	ResourceToolQuery resourceToolQuery;
	@Override
	public CommonResponse<PageInfo<Map<String, Object>>> queryEquipmentInfo(CommonRequest<HashMap<String, Object>> conditionMap) throws Exception {
		return resourceToolQuery.queryWorkToolByOrg(conditionMap);
	public CommonResponse<PageBean<Map<String, Object>>> queryEquipmentInfo(CommonRequest<HashMap<String, Object>> conditionMap) throws Exception {
		return resourceToolQuery.queryWorkToolByConditions(conditionMap);
	}
	@Override
@@ -66,6 +64,9 @@ public class EquipmentManageServiceImpl implements EquipmentManageService {
	@Override
	public CommonResponse<ResourceTool> deleteEquipmentInfo(CommonRequest<List<String>> resourceToolCommonRequest) throws Exception {
		//删除绑定终端关系
		resourceToolCommand.deleteWorkToolsDevRelaByWorkToolId(resourceToolCommonRequest);
		//删除设备信息
		return resourceToolCommand.deleteWorkTool(resourceToolCommonRequest);
	}

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

@@ -6,13 +6,13 @@ 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.components.common.model.PageBean;
import com.ai.bss.work.tool.model.ResourceTool;
import com.ai.bss.work.tool.model.ResourceToolType;
public interface EquipmentManageService {
    CommonResponse<PageInfo<Map<String, Object>>> queryEquipmentInfo(CommonRequest<HashMap<String, Object>> conditionMap) throws Exception;
    CommonResponse<PageBean<Map<String, Object>>> queryEquipmentInfo(CommonRequest<HashMap<String, Object>> conditionMap) throws Exception;
    
    Map<String, Object> queryOneEquipmentInfo(Map<String,Object> params) throws Exception;