feat(可回溯): 重构
重构为mysql
This commit is contained in:
+4
-2
@@ -1,6 +1,8 @@
|
||||
package com.wabestway.recall.trace.dto;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
import lombok.Data;
|
||||
import com.wabestway.commons.http.PageDTO;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
@@ -8,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
*
|
||||
*
|
||||
* @author wangH
|
||||
* @company 北京华焱坤泰科技有限公司
|
||||
@@ -36,7 +38,7 @@ public class RecallRecordDTO extends PageDTO implements Serializable {
|
||||
private String content;
|
||||
/** 记录事件 */
|
||||
@ApiModelProperty(value = "记录事件")
|
||||
private Blob events;
|
||||
private List<String> events;
|
||||
/** 回溯记录跟踪ID */
|
||||
@ApiModelProperty(value = "回溯记录跟踪ID")
|
||||
private String traceId;
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
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;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* @author wangH
|
||||
* @company 北京华焱坤泰科技有限公司
|
||||
* @Time 2023-05-06 17:37:03
|
||||
*/
|
||||
@Data
|
||||
@ApiModel
|
||||
public class TraceDTO implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty(value = "主键")
|
||||
private String id;
|
||||
/**
|
||||
* 产品编码
|
||||
*/
|
||||
@ApiModelProperty(value = "产品编码")
|
||||
private String productCode;
|
||||
/**
|
||||
* 产品名称
|
||||
*/
|
||||
@ApiModelProperty(value = "产品名称")
|
||||
private String productName;
|
||||
/**
|
||||
* 模块
|
||||
*/
|
||||
@ApiModelProperty(value = "模块")
|
||||
private String module;
|
||||
/**
|
||||
* 页面说明
|
||||
*/
|
||||
@ApiModelProperty(value = "页面说明")
|
||||
private String content;
|
||||
/**
|
||||
* 记录事件
|
||||
*/
|
||||
@ApiModelProperty(value = "记录事件")
|
||||
private List<String> events;
|
||||
/**
|
||||
* 回溯记录跟踪ID
|
||||
*/
|
||||
@ApiModelProperty(value = "回溯记录跟踪ID")
|
||||
private String traceId;
|
||||
/**
|
||||
* 回溯订单Id
|
||||
*/
|
||||
@ApiModelProperty(value = "回溯订单Id")
|
||||
private String orderId;
|
||||
/**
|
||||
* 是否最后提交
|
||||
*/
|
||||
@ApiModelProperty(value = "是否最后提交")
|
||||
private boolean last;
|
||||
/**
|
||||
* 调用接口appKey
|
||||
*/
|
||||
@ApiModelProperty(value = "调用接口appKey")
|
||||
private String appKey;
|
||||
|
||||
|
||||
}
|
||||
+3
-1
@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
*
|
||||
*
|
||||
@@ -27,7 +29,7 @@ public class RecallRecordEntity {
|
||||
/** 页面说明 */
|
||||
private String content;
|
||||
/** 记录事件 */
|
||||
private Blob events;
|
||||
private List<String> events;
|
||||
/** 回溯记录跟踪ID */
|
||||
private String traceId;
|
||||
/** 创建人 */
|
||||
|
||||
+14
@@ -44,5 +44,19 @@ public interface RecallOrderService extends IService<RecallOrderEntity> {
|
||||
* @return
|
||||
*/
|
||||
RecallOrderVO queryRecallOrderById(String id);
|
||||
|
||||
/**
|
||||
* 根据业务订单Id 查询回溯订单
|
||||
* @param orderId
|
||||
* @return
|
||||
*/
|
||||
RecallOrderEntity queryRecallOrderByOrderId(String orderId);
|
||||
|
||||
/**
|
||||
* 根据回溯轨迹ID 查询回溯订单
|
||||
* @param traceId
|
||||
* @return
|
||||
*/
|
||||
RecallOrderEntity queryRecallOrderByTraceId(String traceId);
|
||||
}
|
||||
|
||||
|
||||
+21
-4
@@ -1,7 +1,9 @@
|
||||
package com.wabestway.recall.trace.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.core.metadata.OrderItem;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
@@ -10,11 +12,10 @@ import com.wabestway.recall.trace.entity.RecallOrderEntity;
|
||||
import com.wabestway.recall.trace.dto.RecallOrderDTO;
|
||||
import com.wabestway.recall.trace.vo.RecallOrderVO;
|
||||
import com.wabestway.recall.trace.service.RecallOrderService;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
*
|
||||
*
|
||||
* @author wangH
|
||||
* @company 北京华焱坤泰科技有限公司
|
||||
* @Time 2023-05-06 17:37:03
|
||||
@@ -24,7 +25,7 @@ public class RecallOrderServiceImpl extends ServiceImpl<RecallOrderDao, RecallOr
|
||||
|
||||
@Override
|
||||
public IPage<RecallOrderVO> queryRecallOrderByCondition(long page, long size, RecallOrderDTO recallOrderDTO) {
|
||||
Page<RecallOrderDTO> paramReq = new Page<>(page,size);
|
||||
Page<RecallOrderDTO> paramReq = new Page<>(page, size);
|
||||
paramReq.addOrder(new OrderItem().setColumn("create_time").setAsc(false));//创建时间降序排序
|
||||
IPage<RecallOrderVO> iPage = baseMapper.queryRecallOrderByCondition(paramReq, recallOrderDTO);
|
||||
return iPage;
|
||||
@@ -40,7 +41,23 @@ public class RecallOrderServiceImpl extends ServiceImpl<RecallOrderDao, RecallOr
|
||||
}
|
||||
|
||||
@Override
|
||||
public RecallOrderVO queryRecallOrderById(String id ) {
|
||||
public RecallOrderVO queryRecallOrderById(String id) {
|
||||
return baseMapper.queryRecallOrderById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public RecallOrderEntity queryRecallOrderByOrderId(String orderId) {
|
||||
LambdaQueryWrapper<RecallOrderEntity> orderQuery = Wrappers.lambdaQuery();
|
||||
orderQuery.eq(RecallOrderEntity::getOrderId, orderId);
|
||||
orderQuery.last("limit 1");
|
||||
return baseMapper.selectOne(orderQuery);
|
||||
}
|
||||
|
||||
@Override
|
||||
public RecallOrderEntity queryRecallOrderByTraceId(String traceId) {
|
||||
LambdaQueryWrapper<RecallOrderEntity> orderQuery = Wrappers.lambdaQuery();
|
||||
orderQuery.eq(RecallOrderEntity::getOrderId, traceId);
|
||||
orderQuery.last("limit 1");
|
||||
return baseMapper.selectOne(orderQuery);
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,8 @@
|
||||
package com.wabestway.recall.trace.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
import lombok.Data;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
@@ -34,7 +36,7 @@ public class RecallRecordVO implements Serializable {
|
||||
private String content;
|
||||
/** 记录事件 */
|
||||
@ApiModelProperty(value = "记录事件")
|
||||
private Blob events;
|
||||
private List<String> events;
|
||||
/** 回溯记录跟踪ID */
|
||||
@ApiModelProperty(value = "回溯记录跟踪ID")
|
||||
private String traceId;
|
||||
|
||||
Reference in New Issue
Block a user