Merge pull request 'feat/ocrPictureLog_20240419' (#132) from feat/ocrPictureLog_20240419 into test
Reviewed-on: #132pull/133/head
commit
0ceb8f614f
@ -0,0 +1,58 @@
|
||||
package cn.jyjz.xiaoyao.ocr.controller;
|
||||
|
||||
import cn.jyjz.xiaoyao.admin.service.UserService;
|
||||
import cn.jyjz.xiaoyao.common.base.controller.BaseController;
|
||||
import cn.jyjz.xiaoyao.common.base.param.ParamterPage;
|
||||
import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
|
||||
import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
|
||||
import cn.jyjz.xiaoyao.common.mybatisplus.util.SearchQueryFormat;
|
||||
import cn.jyjz.xiaoyao.ocr.dataobject.OcrField;
|
||||
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureLog;
|
||||
import cn.jyjz.xiaoyao.ocr.service.OcrPictureLogService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/ocr/picturelog")
|
||||
public class OcrPictureLogController extends BaseController {
|
||||
|
||||
private Logger log = LoggerFactory.getLogger(this.getClass());
|
||||
|
||||
@Autowired
|
||||
private OcrPictureLogService ocrPictureLogService;
|
||||
|
||||
@Autowired
|
||||
private UserService userService;
|
||||
|
||||
/**
|
||||
* 自定义筛选字段列表查询
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value="根据评审类型查询字段列表", notes="根据评审类型查询字段列表")
|
||||
@GetMapping(value = "/page")
|
||||
public ResultVo<IPage<OcrPictureLog>> list(@RequestParam(name="start", defaultValue="1") Integer start,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
@RequestParam(name="callStatus", defaultValue="1") Integer callStatus,
|
||||
HttpServletRequest request) {
|
||||
QueryWrapper<OcrPictureLog> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("call_status",callStatus);
|
||||
ResultVo<IPage<OcrPictureLog>> resultVo = new ResultVo<>();
|
||||
ParamterPage paramterPage = new ParamterPage();
|
||||
paramterPage.setPagesize(pageSize);
|
||||
paramterPage.setStart(start);
|
||||
IPage<OcrPictureLog> ocrPictureLogIPage = ocrPictureLogService.selectSearchListPage(paramterPage, queryWrapper);
|
||||
resultVo.setData(ocrPictureLogIPage);
|
||||
resultVo.addOK("查询成功");
|
||||
return resultVo;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,93 @@
|
||||
package cn.jyjz.xiaoyao.ocr.dataobject;
|
||||
|
||||
import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
|
||||
import cn.jyjz.xiaoyao.common.mybatisplus.dto.BaseDto;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.sql.Date;
|
||||
import java.util.AbstractMap;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Schema(name = "字段信息", title = "字段信息")
|
||||
@TableName(value = "ocr_picture_log")
|
||||
public class OcrPictureLog implements BaseDto, Serializable {
|
||||
private static final long serialVersionUID = 8088861709460050761L;
|
||||
@Schema(description = "主键")
|
||||
@TableId(value = "id",type = IdType.AUTO)
|
||||
@TableField(value="id")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "调用时间")
|
||||
@TableField(value="call_time")
|
||||
private String callTime;
|
||||
|
||||
@Schema(description = "图片地址")
|
||||
@TableField(value="picture_url")
|
||||
private String pictureUrl;
|
||||
|
||||
@Schema(description = "调用状态")
|
||||
@TableField(value="call_status")
|
||||
private String callStatus;
|
||||
|
||||
@Schema(description = "调用信息")
|
||||
@TableField(value="call_msg")
|
||||
private String callMsg;
|
||||
|
||||
@Schema(description = "创建人")
|
||||
@TableField(value="create_by")
|
||||
private String createBy;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@TableField(value="create_time")
|
||||
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date createTime;
|
||||
|
||||
@Schema(description = "修改人")
|
||||
@TableField(value="update_by")
|
||||
private String updateBy;
|
||||
|
||||
@Schema(description = "修改时间")
|
||||
@TableField(value="update_time")
|
||||
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date updateTime;
|
||||
|
||||
|
||||
//保存当前登录用户的数据权限范围的搜索条件
|
||||
@TableField(exist = false)
|
||||
@JsonIgnore
|
||||
private SearchQuery searchQueryrolesShowleave;
|
||||
|
||||
@TableField(exist = false)
|
||||
@JsonIgnore
|
||||
private final Map<String,String> query = Stream.of(
|
||||
new AbstractMap.SimpleEntry<>("CALLTIME","call_time"),
|
||||
new AbstractMap.SimpleEntry<>("REVIEWTYPE","call_status")
|
||||
)
|
||||
.collect(Collectors.toMap(AbstractMap.SimpleEntry::getKey, AbstractMap.SimpleEntry::getValue));
|
||||
@Override
|
||||
public String getQueryFiled(String filedname){
|
||||
String obj = null;
|
||||
if(null != query && query.size() > 0){
|
||||
obj = query.get(filedname);
|
||||
}
|
||||
return obj;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="cn.jyjz.xiaoyao.ocr.dataDao.OcrPictureLogMapper">
|
||||
|
||||
<resultMap id="BaseResultMap" type="cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureLog">
|
||||
<id column="ID" property="id" jdbcType="BIGINT"/>
|
||||
<result column="create_by" property="createBy" jdbcType="VARCHAR"/>
|
||||
<result column="create_time" property="createTime" jdbcType="BIGINT"/>
|
||||
<result column="update_by" property="updateBy" jdbcType="VARCHAR"/>
|
||||
<result column="update_time" property="updateTime" jdbcType="BIGINT"/>
|
||||
<result column="call_time" property="callTime" jdbcType="VARCHAR"/>
|
||||
<result column="picture_url" property="pictureUrl" jdbcType="VARCHAR"/>
|
||||
<result column="call_status" property="callStatus" jdbcType="VARCHAR"/>
|
||||
<result column="call_msg" property="callMsg" jdbcType="VARCHAR"/>
|
||||
</resultMap>
|
||||
|
||||
</mapper>
|
||||
Loading…
Reference in new issue