diff --git a/afis-recall-service/src/main/java/com/wabestway/recall/trace/dto/TraceDTO.java b/afis-recall-service/src/main/java/com/wabestway/recall/trace/dto/TraceDTO.java index bf7008a..606321c 100644 --- a/afis-recall-service/src/main/java/com/wabestway/recall/trace/dto/TraceDTO.java +++ b/afis-recall-service/src/main/java/com/wabestway/recall/trace/dto/TraceDTO.java @@ -1,6 +1,5 @@ package com.wabestway.recall.trace.dto; -import com.wabestway.commons.http.PageDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/afis-recall-service/src/main/java/com/wabestway/recall/trace/service/RecallOrderService.java b/afis-recall-service/src/main/java/com/wabestway/recall/trace/service/RecallOrderService.java index 4f117d2..95d70da 100644 --- a/afis-recall-service/src/main/java/com/wabestway/recall/trace/service/RecallOrderService.java +++ b/afis-recall-service/src/main/java/com/wabestway/recall/trace/service/RecallOrderService.java @@ -24,13 +24,6 @@ public interface RecallOrderService extends IService { */ IPage queryRecallOrderByCondition(long page, long size, RecallOrderDTO recallOrderDTO); - /** - * 条件查询,不分页 - * @param recallOrderDTO - * @return - */ - List queryRecallOrderListNoPage(RecallOrderDTO recallOrderDTO); - /** * 根据id更新 * @param recallOrder 对象 diff --git a/afis-recall-service/src/main/java/com/wabestway/recall/trace/service/impl/RecallOrderServiceImpl.java b/afis-recall-service/src/main/java/com/wabestway/recall/trace/service/impl/RecallOrderServiceImpl.java index 610420a..a5e9b4c 100644 --- a/afis-recall-service/src/main/java/com/wabestway/recall/trace/service/impl/RecallOrderServiceImpl.java +++ b/afis-recall-service/src/main/java/com/wabestway/recall/trace/service/impl/RecallOrderServiceImpl.java @@ -31,9 +31,6 @@ public class RecallOrderServiceImpl extends ServiceImpl queryRecallOrderListNoPage(RecallOrderDTO recallOrderDTO) { - return baseMapper.queryRecallOrderListNoPage(recallOrderDTO); - } @Override public void updateRecallOrderById(RecallOrderEntity recallOrder) { diff --git a/afis-recall-web/src/main/java/com/wabestway/recall/trace/controller/RecallOrderController.java b/afis-recall-web/src/main/java/com/wabestway/recall/trace/controller/RecallOrderController.java index 1187a48..04cb16d 100644 --- a/afis-recall-web/src/main/java/com/wabestway/recall/trace/controller/RecallOrderController.java +++ b/afis-recall-web/src/main/java/com/wabestway/recall/trace/controller/RecallOrderController.java @@ -20,8 +20,11 @@ import com.wabestway.commons.http.ResObj; @RequestMapping("/order") @Api(tags = {"-接口"}, description = "-接口") public class RecallOrderController { - @Autowired - private RecallOrderApiService recallOrderApiService; + private final RecallOrderApiService recallOrderApiService; + + public RecallOrderController(RecallOrderApiService recallOrderApiService) { + this.recallOrderApiService = recallOrderApiService; + } /** * 列表 @@ -38,7 +41,7 @@ public class RecallOrderController { @GetMapping("/info/{id}") @ApiOperation(value = "根据id查详情", notes = "根据id查详情", httpMethod = "GET") public ResObj info(@PathVariable("id") String id) { - return recallOrderApiService.getRecallOrder(id); + return recallOrderApiService.getRecallOrderByOrderId(id); } /** diff --git a/afis-recall-web/src/main/java/com/wabestway/recall/trace/service/RecallOrderApiService.java b/afis-recall-web/src/main/java/com/wabestway/recall/trace/service/RecallOrderApiService.java index 85293b3..f42848b 100644 --- a/afis-recall-web/src/main/java/com/wabestway/recall/trace/service/RecallOrderApiService.java +++ b/afis-recall-web/src/main/java/com/wabestway/recall/trace/service/RecallOrderApiService.java @@ -1,6 +1,5 @@ package com.wabestway.recall.trace.service; -import java.util.List; import com.wabestway.recall.trace.dto.RecallOrderDTO; import com.wabestway.recall.trace.vo.RecallOrderVO; import com.wabestway.commons.http.Paging; @@ -8,8 +7,6 @@ import com.wabestway.commons.http.ResObj; /** - * - * * @author wangH * @company 北京华焱坤泰科技有限公司 * @Time 2023-05-06 17:37:03 @@ -18,20 +15,17 @@ public interface RecallOrderApiService { /** * 列表 + * * @param paramReq * @return */ ResObj> list(RecallOrderDTO paramReq); - /** - * 查询详情 - * @param id - * @return - */ - ResObj getRecallOrder(String id); ResObj getRecallOrderByOrderId(String orderId); + /** * 根据回溯文件生成MP4视频 + * * @return */ ResObj traceVideo(); diff --git a/afis-recall-web/src/main/java/com/wabestway/recall/trace/service/RecallRecordApiService.java b/afis-recall-web/src/main/java/com/wabestway/recall/trace/service/RecallRecordApiService.java index 72c1b65..bdb15c4 100644 --- a/afis-recall-web/src/main/java/com/wabestway/recall/trace/service/RecallRecordApiService.java +++ b/afis-recall-web/src/main/java/com/wabestway/recall/trace/service/RecallRecordApiService.java @@ -1,11 +1,7 @@ package com.wabestway.recall.trace.service; -import java.util.List; -import com.wabestway.recall.trace.dto.RecallRecordDTO; import com.wabestway.recall.trace.dto.TraceDTO; -import com.wabestway.recall.trace.vo.RecallRecordVO; -import com.wabestway.commons.http.Paging; import com.wabestway.commons.http.ResObj; diff --git a/afis-recall-web/src/main/java/com/wabestway/recall/trace/service/impl/RecallOrderApiServiceImpl.java b/afis-recall-web/src/main/java/com/wabestway/recall/trace/service/impl/RecallOrderApiServiceImpl.java index 566e75b..042c74c 100644 --- a/afis-recall-web/src/main/java/com/wabestway/recall/trace/service/impl/RecallOrderApiServiceImpl.java +++ b/afis-recall-web/src/main/java/com/wabestway/recall/trace/service/impl/RecallOrderApiServiceImpl.java @@ -52,15 +52,11 @@ public class RecallOrderApiServiceImpl implements RecallOrderApiService { return ResObj.ok(paging); } - @Override - public ResObj getRecallOrder(String id) { - RecallOrderVO recallOrderVO = recallOrderService.queryRecallOrderById(id); - return ResObj.ok(recallOrderVO); - } @Override public ResObj getRecallOrderByOrderId(String orderId) { - return null; + RecallOrderVO recallOrderVO = recallOrderService.queryRecallOrderById(orderId); + return ResObj.ok(recallOrderVO); } @Override