统一设备管理的返回格式

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

@@ -4,6 +4,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ai.bss.components.common.model.PageInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,7 +43,6 @@ public class EquipmentManageController {
		// 当前页数
		int pageNumber = conditionMap.getPageNumber() < 1 ? 1 : conditionMap.getPageNumber();
		// 每页条数
		int pageSize = conditionMap.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE : conditionMap.getPageSize();
		conditionMap.setPageSize(pageSize);
@@ -97,12 +97,10 @@ public class EquipmentManageController {
	 */
	@ResponseBody
	@RequestMapping("/queryAllEquipmentNotBind")
	public Map<String, Object> queryAllEquipmentNotBind() throws Exception {
	public CommonResponse<PageInfo<Map<String, Object>>> queryAllEquipmentNotBind() throws Exception {
		Map<String, Object> result = new HashMap<String, Object>();
		List<Map<String, Object>> resultList = equipmentManageService.queryAllEquipmentNotBind();
		result.put("dataList", resultList);
		return result;
		return equipmentManageService.queryAllEquipmentNotBind();
	}

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

@@ -60,13 +60,12 @@ public class EquipmentManageServiceImpl<EquipmentManageDao> implements Equipment
    }
    @Override
    public List<Map<String, Object>> queryAllEquipmentNotBind() throws Exception {
    public CommonResponse<PageInfo<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();
        return resourceToolQuery.queryWorkToolByOrgAndBindFlag(commonRequest);
    }
}

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

@@ -7,6 +7,7 @@ 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;
@@ -22,5 +23,5 @@ public interface EquipmentManageService {
    CommonResponse<List<ResourceToolType>> loadAllResourceToolType(CommonRequest commonRequest);
    List<Map<String, Object>> queryAllEquipmentNotBind() throws Exception;
    CommonResponse<PageInfo<Map<String, Object>>>queryAllEquipmentNotBind() throws Exception;
}