feat(可回溯): 重构
优化代码
This commit is contained in:
@@ -1,6 +1,5 @@
|
|||||||
package com.wabestway.recall.trace.dto;
|
package com.wabestway.recall.trace.dto;
|
||||||
|
|
||||||
import com.wabestway.commons.http.PageDTO;
|
|
||||||
import io.swagger.annotations.ApiModel;
|
import io.swagger.annotations.ApiModel;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|||||||
-7
@@ -24,13 +24,6 @@ public interface RecallOrderService extends IService<RecallOrderEntity> {
|
|||||||
*/
|
*/
|
||||||
IPage<RecallOrderVO> queryRecallOrderByCondition(long page, long size, RecallOrderDTO recallOrderDTO);
|
IPage<RecallOrderVO> queryRecallOrderByCondition(long page, long size, RecallOrderDTO recallOrderDTO);
|
||||||
|
|
||||||
/**
|
|
||||||
* 条件查询,不分页
|
|
||||||
* @param recallOrderDTO
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
List<RecallOrderVO> queryRecallOrderListNoPage(RecallOrderDTO recallOrderDTO);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据id更新
|
* 根据id更新
|
||||||
* @param recallOrder 对象
|
* @param recallOrder 对象
|
||||||
|
|||||||
-3
@@ -31,9 +31,6 @@ public class RecallOrderServiceImpl extends ServiceImpl<RecallOrderDao, RecallOr
|
|||||||
return iPage;
|
return iPage;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<RecallOrderVO> queryRecallOrderListNoPage(RecallOrderDTO recallOrderDTO) {
|
|
||||||
return baseMapper.queryRecallOrderListNoPage(recallOrderDTO);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateRecallOrderById(RecallOrderEntity recallOrder) {
|
public void updateRecallOrderById(RecallOrderEntity recallOrder) {
|
||||||
|
|||||||
+6
-3
@@ -20,8 +20,11 @@ import com.wabestway.commons.http.ResObj;
|
|||||||
@RequestMapping("/order")
|
@RequestMapping("/order")
|
||||||
@Api(tags = {"-接口"}, description = "-接口")
|
@Api(tags = {"-接口"}, description = "-接口")
|
||||||
public class RecallOrderController {
|
public class RecallOrderController {
|
||||||
@Autowired
|
private final RecallOrderApiService recallOrderApiService;
|
||||||
private RecallOrderApiService recallOrderApiService;
|
|
||||||
|
public RecallOrderController(RecallOrderApiService recallOrderApiService) {
|
||||||
|
this.recallOrderApiService = recallOrderApiService;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 列表
|
* 列表
|
||||||
@@ -38,7 +41,7 @@ public class RecallOrderController {
|
|||||||
@GetMapping("/info/{id}")
|
@GetMapping("/info/{id}")
|
||||||
@ApiOperation(value = "根据id查详情", notes = "根据id查详情", httpMethod = "GET")
|
@ApiOperation(value = "根据id查详情", notes = "根据id查详情", httpMethod = "GET")
|
||||||
public ResObj<RecallOrderVO> info(@PathVariable("id") String id) {
|
public ResObj<RecallOrderVO> info(@PathVariable("id") String id) {
|
||||||
return recallOrderApiService.getRecallOrder(id);
|
return recallOrderApiService.getRecallOrderByOrderId(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+3
-9
@@ -1,6 +1,5 @@
|
|||||||
package com.wabestway.recall.trace.service;
|
package com.wabestway.recall.trace.service;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import com.wabestway.recall.trace.dto.RecallOrderDTO;
|
import com.wabestway.recall.trace.dto.RecallOrderDTO;
|
||||||
import com.wabestway.recall.trace.vo.RecallOrderVO;
|
import com.wabestway.recall.trace.vo.RecallOrderVO;
|
||||||
import com.wabestway.commons.http.Paging;
|
import com.wabestway.commons.http.Paging;
|
||||||
@@ -8,8 +7,6 @@ import com.wabestway.commons.http.ResObj;
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
|
||||||
*
|
|
||||||
* @author wangH
|
* @author wangH
|
||||||
* @company 北京华焱坤泰科技有限公司
|
* @company 北京华焱坤泰科技有限公司
|
||||||
* @Time 2023-05-06 17:37:03
|
* @Time 2023-05-06 17:37:03
|
||||||
@@ -18,20 +15,17 @@ public interface RecallOrderApiService {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 列表
|
* 列表
|
||||||
|
*
|
||||||
* @param paramReq
|
* @param paramReq
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
ResObj<Paging<RecallOrderVO>> list(RecallOrderDTO paramReq);
|
ResObj<Paging<RecallOrderVO>> list(RecallOrderDTO paramReq);
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询详情
|
|
||||||
* @param id
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
ResObj<RecallOrderVO> getRecallOrder(String id);
|
|
||||||
ResObj<RecallOrderVO> getRecallOrderByOrderId(String orderId);
|
ResObj<RecallOrderVO> getRecallOrderByOrderId(String orderId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据回溯文件生成MP4视频
|
* 根据回溯文件生成MP4视频
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
ResObj traceVideo();
|
ResObj traceVideo();
|
||||||
|
|||||||
-4
@@ -1,11 +1,7 @@
|
|||||||
package com.wabestway.recall.trace.service;
|
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.dto.TraceDTO;
|
||||||
import com.wabestway.recall.trace.vo.RecallRecordVO;
|
|
||||||
import com.wabestway.commons.http.Paging;
|
|
||||||
import com.wabestway.commons.http.ResObj;
|
import com.wabestway.commons.http.ResObj;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+2
-6
@@ -52,15 +52,11 @@ public class RecallOrderApiServiceImpl implements RecallOrderApiService {
|
|||||||
return ResObj.ok(paging);
|
return ResObj.ok(paging);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public ResObj<RecallOrderVO> getRecallOrder(String id) {
|
|
||||||
RecallOrderVO recallOrderVO = recallOrderService.queryRecallOrderById(id);
|
|
||||||
return ResObj.ok(recallOrderVO);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ResObj<RecallOrderVO> getRecallOrderByOrderId(String orderId) {
|
public ResObj<RecallOrderVO> getRecallOrderByOrderId(String orderId) {
|
||||||
return null;
|
RecallOrderVO recallOrderVO = recallOrderService.queryRecallOrderById(orderId);
|
||||||
|
return ResObj.ok(recallOrderVO);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user