配合阿龙动态列显示,代码做了一些假数据

pull/1/head
DELL 1 year ago
parent 06c63d0caf
commit db59a7adce

@ -1,8 +1,10 @@
package cn.jyjz.xiaoyao.ocr.controller;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@ -24,6 +26,7 @@ import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
import cn.jyjz.xiaoyao.ocr.service.OcrPackagetaskService;
import cn.jyjz.xiaoyao.ocr.service.OcrPictureService;
import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService;
import cn.jyjz.xiaoyao.ocr.vo.OcrPackagetaskVo;
import cn.jyjz.xiaoyao.upload.upload.UploadSpringUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -109,7 +112,24 @@ public class OcrPackagetaskController extends BaseController{
}
Page<OcrPackagetask> page = new Page<OcrPackagetask>(pageNo, pageSize);
IPage<OcrPackagetask> pageList = ocrPackagetaskService.page(page, queryWrapper);
return ResultVoUtil.success(pageList);
List<OcrPackagetaskVo> ocrPackagetaskVoList = new ArrayList<>();
for (OcrPackagetask one : pageList.getRecords()) {
OcrPackagetaskVo ocrPackagetaskVo = new OcrPackagetaskVo();
ocrPackagetaskVo.setId(one.getId());
ocrPackagetaskVo.setCreateBy(one.getCreateBy());
ocrPackagetaskVo.setCreateTime(one.getCreateTime());
ocrPackagetaskVo.setUpdateBy(one.getUpdateBy());
ocrPackagetaskVo.setUpdateTime(one.getUpdateTime());
ocrPackagetaskVo.setTenantId(one.getTenantId());
ocrPackagetaskVo.setPackagename(one.getPackagename());
ocrPackagetaskVo.setPictureno(one.getPictureno());
ocrPackagetaskVo.setSimilaritys(one.getSimilaritys());
ocrPackagetaskVo.setSearchtimes(one.getSearchtimes());
ocrPackagetaskVoList.add(ocrPackagetaskVo);
}
return ResultVoUtil.success(ocrPackagetaskVoList);
}
/**

@ -17,6 +17,8 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.data.annotation.Transient;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Map;
@ -110,4 +112,5 @@ public class OcrPackagetask implements BaseDto,java.io.Serializable {
}
return obj;
}
}

@ -232,6 +232,14 @@ public class OcrTaskchildPicture implements BaseDto, java.io.Serializable {
@TableField(exist = false)
private Userapprove userapprove;
@ApiModelProperty(value = "拜访终端")
@TableField(exist = false)
private String field3 = "测试拜访终端";
@ApiModelProperty(value = "是否重复")
@TableField(exist = false)
private String field14 = "重复";
@ApiModelProperty(value = "审查日志")
@TableField(exist = false)
private List<Userapprove> userapproveList;

@ -0,0 +1,83 @@
package cn.jyjz.xiaoyao.ocr.vo;
import cn.jyjz.xiaoyao.common.base.jsonDomain.DateNotimeSerializer;
import cn.jyjz.xiaoyao.common.mybatisplus.dto.BaseDto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "任务包", title = "任务包")
public class OcrPackagetaskVo implements Serializable {
private static final long serialVersionUID = -3500422812469364660L;
@Schema(description = "主键")
private Long id;
@Schema(description = "创建人")
private String createBy;
@Schema(description = "创建时间")
@JsonSerialize(using = DateNotimeSerializer.class)
private Long createTime;
@Schema(description = "修改人")
private String updateBy;
@Schema(description = "修改时间")
@JsonSerialize(using = DateNotimeSerializer.class)
private Long updateTime;
@Schema(description = "租户ID")
@JsonSerialize(using = ToStringSerializer.class)
private Long tenantId;
@Schema(description = "任务包名称")
private String packagename;
@Schema(description = "主图数量")
private Integer pictureno;
@Schema(description = "相似度,记录相似度内容")
private String similaritys;
@Schema(description = "筛选时间,记录筛选的内容")
private String searchtimes;
@Schema(description = "生成时间")
private String genTime = "2023-01-01";
@Schema(description = "提报人")
private String field1 = "张某某";
@Schema(description = "任务状态")
private String field16 = "待审批";
@Schema(description = "是否重复")
private String field14 = "是否重复";
@Schema(description = "拜访终端")
private String field3 = "拜访终端";
@Schema(description = "拜访省份")
private String releaseProvince = "北京市";
@Schema(description = "拜访客户级别")
private String field6 = "测试拜访客户级别";
@Schema(description = "拜访项目类别")
private String field17 = "测试拜访项目类别";
@Schema(description = "任务类型")
private String field15 = "任务类型";
@Schema(description = "任务来源")
private String field4 = "测试任务来源";
@Schema(description = "所属项目")
private String FROMPROJECTID = "测试所属项目";
@Schema(description = "提报时间")
private String FROMUPTIME = "测试提报时间";
}
Loading…
Cancel
Save