Commit 22858340e2b8ae6014482c2ad25c9b6440301402

Authored by 胡翰林
1 parent a4561465

故障原因管理接口

设备报修维修接口
@@ -19,6 +19,7 @@ import org.thingsboard.server.dao.yunteng.service.TkDeviceService; @@ -19,6 +19,7 @@ import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
19 import org.thingsboard.server.dao.yunteng.service.TkRepairOrderService; 19 import org.thingsboard.server.dao.yunteng.service.TkRepairOrderService;
20 import org.thingsboard.server.queue.util.TbCoreComponent; 20 import org.thingsboard.server.queue.util.TbCoreComponent;
21 21
  22 +import java.util.Map;
22 import java.util.UUID; 23 import java.util.UUID;
23 24
24 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE; 25 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE;
@@ -86,10 +87,10 @@ public class TkRepairOrderController extends BaseController { @@ -86,10 +87,10 @@ public class TkRepairOrderController extends BaseController {
86 public TkPageData<TkRepairOrderDTO> pageMalfunctionReason( 87 public TkPageData<TkRepairOrderDTO> pageMalfunctionReason(
87 @RequestParam(PAGE_SIZE) int pageSize, 88 @RequestParam(PAGE_SIZE) int pageSize,
88 @RequestParam(PAGE) int page, 89 @RequestParam(PAGE) int page,
89 - @RequestBody TkRepairOrderDTO params) 90 + @RequestBody Map<String, Object> params)
90 throws ThingsboardException { 91 throws ThingsboardException {
91 - params.setPage(page);  
92 - params.setPageSize(pageSize); 92 + params.put(PAGE, page);
  93 + params.put(PAGE_SIZE, pageSize);
93 return tkRepairOrderService.page(getCurrentUser().getCurrentTenantId(), params); 94 return tkRepairOrderService.page(getCurrentUser().getCurrentTenantId(), params);
94 } 95 }
95 } 96 }
1 package org.thingsboard.server.dao.yunteng.service; 1 package org.thingsboard.server.dao.yunteng.service;
2 2
3 3
  4 +import com.baomidou.mybatisplus.core.metadata.IPage;
4 import org.thingsboard.server.common.data.exception.ThingsboardException; 5 import org.thingsboard.server.common.data.exception.ThingsboardException;
5 import org.thingsboard.server.common.data.yunteng.dto.TkRepairOrderDTO; 6 import org.thingsboard.server.common.data.yunteng.dto.TkRepairOrderDTO;
6 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; 7 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
@@ -8,9 +9,10 @@ import org.thingsboard.server.dao.yunteng.entities.TkRepairOrderEntity; @@ -8,9 +9,10 @@ import org.thingsboard.server.dao.yunteng.entities.TkRepairOrderEntity;
8 9
9 import java.util.Map; 10 import java.util.Map;
10 11
  12 +
11 public interface TkRepairOrderService extends BaseService<TkRepairOrderEntity> { 13 public interface TkRepairOrderService extends BaseService<TkRepairOrderEntity> {
12 14
13 - TkPageData<TkRepairOrderDTO> page(String tenantId, TkRepairOrderDTO params); 15 + TkPageData<TkRepairOrderDTO> page(String tenantId,Map<String, Object> params);
14 16
15 TkRepairOrderDTO save(TkRepairOrderDTO dto); 17 TkRepairOrderDTO save(TkRepairOrderDTO dto);
16 18