pull/1/head
DELL 1 year ago
parent 113e271389
commit 97a87fdec9

@ -1,49 +1,49 @@
package cn.jyjz.xiaoyao.ocr.controller; //package cn.jyjz.xiaoyao.ocr.controller;
//
import cn.jyjz.xiaoyao.admin.service.UserService; //import cn.jyjz.xiaoyao.admin.service.UserService;
import cn.jyjz.xiaoyao.common.base.controller.BaseController; //import cn.jyjz.xiaoyao.common.base.controller.BaseController;
import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil; //import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil;
import cn.jyjz.xiaoyao.common.base.vo.ResultVo; //import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil; //import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
import cn.jyjz.xiaoyao.common.base.vo.UserToken; //import cn.jyjz.xiaoyao.common.base.vo.UserToken;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrField; //import cn.jyjz.xiaoyao.ocr.dataobject.OcrField;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrSearchmanager; //import cn.jyjz.xiaoyao.ocr.dataobject.OcrSearchmanager;
import cn.jyjz.xiaoyao.ocr.dto.OcrFieldDto; //import cn.jyjz.xiaoyao.ocr.dto.OcrFieldDto;
import cn.jyjz.xiaoyao.ocr.service.OcrFieldService; //import cn.jyjz.xiaoyao.ocr.service.OcrFieldService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; //import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.ApiImplicitParam; //import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; //import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; //import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.media.Schema; //import io.swagger.v3.oas.annotations.media.Schema;
import org.apache.commons.lang3.StringUtils; //import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; //import org.slf4j.Logger;
import org.slf4j.LoggerFactory; //import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; //import org.springframework.web.bind.annotation.*;
//
import javax.servlet.http.HttpServletRequest; //import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList; //import java.util.ArrayList;
import java.util.List; //import java.util.List;
//
@RestController //@RestController
@RequestMapping("/ocr/field") //@RequestMapping("/ocr/field")
public class OcrFieldController extends BaseController{ //public class OcrFieldController extends BaseController{
//
private Logger log = LoggerFactory.getLogger(this.getClass()); // private Logger log = LoggerFactory.getLogger(this.getClass());
//
@Autowired // @Autowired
private OcrFieldService ocrFieldService; // private OcrFieldService ocrFieldService;
//
/** // /**
* // * 自定义筛选字段列表查询
* @return // * @return
*/ // */
@ApiOperation(value="自定义筛选字段列表查询", notes="自定义筛选字段列表查询") // @ApiOperation(value="自定义筛选字段列表查询", notes="自定义筛选字段列表查询")
@GetMapping(value = "/list") // @GetMapping(value = "/list")
public ResultVo<List<OcrFieldDto>> list(HttpServletRequest req, @Schema(description = "字段类型一审1二审2终审0") Integer reviewType) { // public ResultVo<List<OcrFieldDto>> list(HttpServletRequest req, @Schema(description = "字段类型一审1二审2终审0") Integer reviewType) {
ResultVo<List<OcrFieldDto>> resultVo = new ResultVo<>(); // ResultVo<List<OcrFieldDto>> resultVo = new ResultVo<>();
List<OcrFieldDto> ocrFieldDtos = ocrFieldService.list(reviewType); // List<OcrFieldDto> ocrFieldDtos = ocrFieldService.list(reviewType);
resultVo.addOK(ocrFieldDtos); // resultVo.addOK(ocrFieldDtos);
return resultVo; // return resultVo;
} // }
} //}

@ -1,15 +1,15 @@
package cn.jyjz.xiaoyao.ocr.controller; //package cn.jyjz.xiaoyao.ocr.controller;
//
import cn.jyjz.xiaoyao.common.base.controller.BaseController; //import cn.jyjz.xiaoyao.common.base.controller.BaseController;
import org.slf4j.Logger; //import org.slf4j.Logger;
import org.slf4j.LoggerFactory; //import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.RequestMapping; //import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; //import org.springframework.web.bind.annotation.RestController;
//
@RestController //@RestController
@RequestMapping("/ocr/user/field") //@RequestMapping("/ocr/user/field")
public class OcrUserFieldController extends BaseController{ //public class OcrUserFieldController extends BaseController{
//
private Logger log = LoggerFactory.getLogger(this.getClass()); // private Logger log = LoggerFactory.getLogger(this.getClass());
//
} //}

@ -1,13 +1,13 @@
package cn.jyjz.xiaoyao.ocr.dataDao; //package cn.jyjz.xiaoyao.ocr.dataDao;
//
import cn.jyjz.xiaoyao.ocr.dataobject.OcrArea; //import cn.jyjz.xiaoyao.ocr.dataobject.OcrArea;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrField; //import cn.jyjz.xiaoyao.ocr.dataobject.OcrField;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; //import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; //import org.apache.ibatis.annotations.Mapper;
//
/** ///**
* //* 数据持久化
*/ //*/
@Mapper //@Mapper
public interface OcrFieldMybatisDao extends BaseMapper<OcrField> { //public interface OcrFieldMybatisDao extends BaseMapper<OcrField> {
} //}

@ -1,13 +1,13 @@
package cn.jyjz.xiaoyao.ocr.dataDao; //package cn.jyjz.xiaoyao.ocr.dataDao;
//
import cn.jyjz.xiaoyao.ocr.dataobject.OcrField; ////import cn.jyjz.xiaoyao.ocr.dataobject.OcrField;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrUserField; //import cn.jyjz.xiaoyao.ocr.dataobject.OcrUserField;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; //import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; //import org.apache.ibatis.annotations.Mapper;
//
/** ///**
* //* 数据持久化
*/ //*/
@Mapper //@Mapper
public interface OcrUserFieldMybatisDao extends BaseMapper<OcrUserField> { //public interface OcrUserFieldMybatisDao extends BaseMapper<OcrUserField> {
} //}

@ -1,66 +1,66 @@
package cn.jyjz.xiaoyao.ocr.dataobject; //package cn.jyjz.xiaoyao.ocr.dataobject;
//
import cn.jyjz.xiaoyao.admin.dataobject.Tenant; //import cn.jyjz.xiaoyao.admin.dataobject.Tenant;
import cn.jyjz.xiaoyao.common.base.jsonDomain.DateSerializer; //import cn.jyjz.xiaoyao.common.base.jsonDomain.DateSerializer;
import com.baomidou.mybatisplus.annotation.IdType; //import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; //import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; //import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; //import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; //import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; //import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; //import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.v3.oas.annotations.media.Schema; //import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; //import lombok.AllArgsConstructor;
import lombok.Builder; //import lombok.Builder;
import lombok.Data; //import lombok.Data;
import lombok.NoArgsConstructor; //import lombok.NoArgsConstructor;
//
import java.io.Serializable; //import java.io.Serializable;
//
@Data //@Data
@Builder //@Builder
@NoArgsConstructor //@NoArgsConstructor
@AllArgsConstructor //@AllArgsConstructor
@Schema(name = "字段信息", title = "字段信息") //@Schema(name = "字段信息", title = "字段信息")
@TableName(value = "ocr_field") //@TableName(value = "ocr_field")
public class OcrField implements Serializable { //public class OcrField implements Serializable {
private static final long serialVersionUID = 8088861709460050761L; // private static final long serialVersionUID = 8088861709460050761L;
@Schema(description = "主键") // @Schema(description = "主键")
@TableId(value = "id",type = IdType.AUTO) // @TableId(value = "id",type = IdType.AUTO)
@TableField(value="id") // @TableField(value="id")
private Long id; // private Long id;
//
@Schema(description = "字段名称") // @Schema(description = "字段名称")
@TableField(value="name") // @TableField(value="name")
private String name; // private String name;
//
@Schema(description = "字段类型一审1二审2终审0") // @Schema(description = "字段类型一审1二审2终审0")
@TableField(value="review_type") // @TableField(value="review_type")
private Integer reviewType; // private Integer reviewType;
//
@Schema(description = "字段描述") // @Schema(description = "字段描述")
@TableField(value="field_desc") // @TableField(value="field_desc")
private String fieldDesc; // private String fieldDesc;
//
@Schema(description = "创建人") // @Schema(description = "创建人")
@TableField(value="create_by") // @TableField(value="create_by")
private String createBy; // private String createBy;
//
@Schema(description = "创建时间") // @Schema(description = "创建时间")
@TableField(value="create_time") // @TableField(value="create_time")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") // @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Data createTime; // private Data createTime;
//
@Schema(description = "修改人") // @Schema(description = "修改人")
@TableField(value="update_by") // @TableField(value="update_by")
private String updateBy; // private String updateBy;
//
@Schema(description = "修改时间") // @Schema(description = "修改时间")
@TableField(value="update_time") // @TableField(value="update_time")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") // @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Data updateTime; // private Data updateTime;
//
@Schema(description = "是否删除0未删除1:已删除") // @Schema(description = "是否删除0未删除1:已删除")
@TableField(value="del") // @TableField(value="del")
private Integer del; // private Integer del;
} //}

@ -1,68 +1,68 @@
package cn.jyjz.xiaoyao.ocr.dataobject; //package cn.jyjz.xiaoyao.ocr.dataobject;
//
import cn.jyjz.xiaoyao.admin.dataobject.Tenant; //import cn.jyjz.xiaoyao.admin.dataobject.Tenant;
import cn.jyjz.xiaoyao.common.base.jsonDomain.DateSerializer; //import cn.jyjz.xiaoyao.common.base.jsonDomain.DateSerializer;
import com.baomidou.mybatisplus.annotation.IdType; //import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; //import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; //import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; //import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; //import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; //import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; //import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.v3.oas.annotations.media.Schema; //import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; //import lombok.AllArgsConstructor;
import lombok.Builder; //import lombok.Builder;
import lombok.Data; //import lombok.Data;
import lombok.NoArgsConstructor; //import lombok.NoArgsConstructor;
//
import java.io.Serializable; //import java.io.Serializable;
//
@Data //@Data
@Builder //@Builder
@NoArgsConstructor //@NoArgsConstructor
@AllArgsConstructor //@AllArgsConstructor
@Schema(name = "用户-展示字段", title = "用户-展示字段") //@Schema(name = "用户-展示字段", title = "用户-展示字段")
@TableName(value = "ocr_user_field") //@TableName(value = "ocr_user_field")
public class OcrUserField implements Serializable { //public class OcrUserField implements Serializable {
private static final long serialVersionUID = 8088861709460050761L; // private static final long serialVersionUID = 8088861709460050761L;
@Schema(description = "主键") // @Schema(description = "主键")
@TableId(value = "id",type = IdType.AUTO) // @TableId(value = "id",type = IdType.AUTO)
@TableField(value="id") // @TableField(value="id")
private Long id; // private Long id;
//
@Schema(description = "用户ID") // @Schema(description = "用户ID")
@TableField(value="user_id") // @TableField(value="user_id")
private long userId; // private long userId;
//
@Schema(description = "评审类型一审1二审2终审0") // @Schema(description = "评审类型一审1二审2终审0")
@TableField(value="review_type") // @TableField(value="review_type")
private Integer reviewType; // private Integer reviewType;
//
@Schema(description = "展示字段字符串") // @Schema(description = "展示字段字符串")
@TableField(value="user_field") // @TableField(value="user_field")
private String userField; // private String userField;
//
@Schema(description = "创建人") // @Schema(description = "创建人")
@TableField(value="create_by") // @TableField(value="create_by")
private String createBy; // private String createBy;
//
@Schema(description = "创建时间") // @Schema(description = "创建时间")
@TableField(value="create_time") // @TableField(value="create_time")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") // @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Data createTime; // private Data createTime;
//
@Schema(description = "修改人") // @Schema(description = "修改人")
@TableField(value="update_by") // @TableField(value="update_by")
private String updateBy; // private String updateBy;
//
@Schema(description = "修改时间") // @Schema(description = "修改时间")
@TableField(value="update_time") // @TableField(value="update_time")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") // @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Data updateTime; // private Data updateTime;
//
@Schema(description = "是否删除0未删除1:已删除") // @Schema(description = "是否删除0未删除1:已删除")
@TableField(value="del") // @TableField(value="del")
private Integer del; // private Integer del;
} //}
//
//

@ -1,47 +1,47 @@
package cn.jyjz.xiaoyao.ocr.dto; //package cn.jyjz.xiaoyao.ocr.dto;
//
import com.baomidou.mybatisplus.annotation.TableField; //import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat; //import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema; //import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; //import lombok.AllArgsConstructor;
import lombok.Builder; //import lombok.Builder;
import lombok.Data; //import lombok.Data;
import lombok.NoArgsConstructor; //import lombok.NoArgsConstructor;
//
import java.io.Serializable; //import java.io.Serializable;
//
@Data //@Data
@Builder //@Builder
@NoArgsConstructor //@NoArgsConstructor
@AllArgsConstructor //@AllArgsConstructor
@Schema(name = "字段信息", title = "字段信息") //@Schema(name = "字段信息", title = "字段信息")
public class OcrFieldDto implements Serializable { //public class OcrFieldDto implements Serializable {
private static final long serialVersionUID = 8088861709460050761L; // private static final long serialVersionUID = 8088861709460050761L;
@Schema(description = "主键") // @Schema(description = "主键")
private Long id; // private Long id;
//
@Schema(description = "字段名称") // @Schema(description = "字段名称")
private String name; // private String name;
//
@Schema(description = "字段类型一审1二审2终审0") // @Schema(description = "字段类型一审1二审2终审0")
private Integer reviewType; // private Integer reviewType;
//
@Schema(description = "字段描述") // @Schema(description = "字段描述")
private String fieldDesc; // private String fieldDesc;
//
@Schema(description = "创建人") // @Schema(description = "创建人")
private String createBy; // private String createBy;
//
@Schema(description = "创建时间") // @Schema(description = "创建时间")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") // @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Data createTime; // private Data createTime;
//
@Schema(description = "修改人") // @Schema(description = "修改人")
private String updateBy; // private String updateBy;
//
@Schema(description = "修改时间") // @Schema(description = "修改时间")
private Data updateTime; // private Data updateTime;
//
@Schema(description = "是否删除0未删除1:已删除") // @Schema(description = "是否删除0未删除1:已删除")
private Integer del; // private Integer del;
} //}

@ -1,51 +1,51 @@
package cn.jyjz.xiaoyao.ocr.dto; //package cn.jyjz.xiaoyao.ocr.dto;
//
import com.baomidou.mybatisplus.annotation.TableName; //import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; //import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema; //import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; //import lombok.AllArgsConstructor;
import lombok.Builder; //import lombok.Builder;
import lombok.Data; //import lombok.Data;
import lombok.NoArgsConstructor; //import lombok.NoArgsConstructor;
//
import java.io.Serializable; //import java.io.Serializable;
//
@Data //@Data
@Builder //@Builder
@NoArgsConstructor //@NoArgsConstructor
@AllArgsConstructor //@AllArgsConstructor
@Schema(name = "用户-展示字段", title = "用户-展示字段") //@Schema(name = "用户-展示字段", title = "用户-展示字段")
@TableName(value = "ocr_user_field") //@TableName(value = "ocr_user_field")
public class OcrUserFieldDto implements Serializable { //public class OcrUserFieldDto implements Serializable {
private static final long serialVersionUID = 8088861709460050761L; // private static final long serialVersionUID = 8088861709460050761L;
@Schema(description = "主键") // @Schema(description = "主键")
private Long id; // private Long id;
//
@Schema(description = "用户ID") // @Schema(description = "用户ID")
private long userId; // private long userId;
//
@Schema(description = "评审类型一审1二审2终审0") // @Schema(description = "评审类型一审1二审2终审0")
private Integer reviewType; // private Integer reviewType;
//
@Schema(description = "展示字段字符串") // @Schema(description = "展示字段字符串")
private String userField; // private String userField;
//
@Schema(description = "创建人") // @Schema(description = "创建人")
private String createBy; // private String createBy;
//
@Schema(description = "创建时间") // @Schema(description = "创建时间")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") // @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Data createTime; // private Data createTime;
//
@Schema(description = "修改人") // @Schema(description = "修改人")
private String updateBy; // private String updateBy;
//
@Schema(description = "修改时间") // @Schema(description = "修改时间")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") // @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Data updateTime; // private Data updateTime;
//
@Schema(description = "是否删除0未删除1:已删除") // @Schema(description = "是否删除0未删除1:已删除")
private Integer del; // private Integer del;
} //}
//
//

@ -1,18 +1,18 @@
package cn.jyjz.xiaoyao.ocr.service; //package cn.jyjz.xiaoyao.ocr.service;
//
import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService; //import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrField; //import cn.jyjz.xiaoyao.ocr.dataobject.OcrField;
import cn.jyjz.xiaoyao.ocr.dto.OcrFieldDto; //import cn.jyjz.xiaoyao.ocr.dto.OcrFieldDto;
//
import java.util.List; //import java.util.List;
//
/** ///**
* //* 业务层
*/ //*/
public interface OcrFieldService extends BaseService<OcrField> { //public interface OcrFieldService extends BaseService<OcrField> {
//
/** // /**
* // * 自定义筛选字段列表查询
*/ // */
List<OcrFieldDto> list(Integer reviewType); // List<OcrFieldDto> list(Integer reviewType);
} //}

@ -1,11 +1,11 @@
package cn.jyjz.xiaoyao.ocr.service; //package cn.jyjz.xiaoyao.ocr.service;
//
import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService; //import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrUserField; //import cn.jyjz.xiaoyao.ocr.dataobject.OcrUserField;
//
/** ///**
* //* 业务层
*/ //*/
public interface OcrUserFieldService extends BaseService<OcrUserField> { //public interface OcrUserFieldService extends BaseService<OcrUserField> {
//
} //}

@ -1,49 +1,49 @@
package cn.jyjz.xiaoyao.ocr.service.impl; //package cn.jyjz.xiaoyao.ocr.service.impl;
//
import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl; //import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl;
import cn.jyjz.xiaoyao.ocr.dataDao.OcrFieldMybatisDao; //import cn.jyjz.xiaoyao.ocr.dataDao.OcrFieldMybatisDao;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrField; //import cn.jyjz.xiaoyao.ocr.dataobject.OcrField;
import cn.jyjz.xiaoyao.ocr.dto.OcrFieldDto; //import cn.jyjz.xiaoyao.ocr.dto.OcrFieldDto;
import cn.jyjz.xiaoyao.ocr.service.OcrFieldService; //import cn.jyjz.xiaoyao.ocr.service.OcrFieldService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; //import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.extern.slf4j.Slf4j; //import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils; //import org.springframework.beans.BeanUtils;
import org.springframework.beans.BeansException; //import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; //import org.springframework.stereotype.Service;
//
import java.util.ArrayList; //import java.util.ArrayList;
import java.util.List; //import java.util.List;
//
//
/** ///**
* //* 业务层实现
*/ //*/
@Service //@Service
@Slf4j //@Slf4j
public class OcrFieldServiceImpl extends BaseServiceImpl<OcrFieldMybatisDao, OcrField> implements OcrFieldService { //public class OcrFieldServiceImpl extends BaseServiceImpl<OcrFieldMybatisDao, OcrField> implements OcrFieldService {
@Autowired // @Autowired
private OcrFieldMybatisDao ocrFieldMybatisDao; // private OcrFieldMybatisDao ocrFieldMybatisDao;
//
@Override // @Override
public List<OcrFieldDto> list(Integer reviewType){ // public List<OcrFieldDto> list(Integer reviewType){
List<OcrFieldDto> ocrFieldDtoList = null; // List<OcrFieldDto> ocrFieldDtoList = null;
try { // try {
LambdaQueryWrapper<OcrField> queryWrapper = new LambdaQueryWrapper<>(); // LambdaQueryWrapper<OcrField> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(OcrField::getReviewType, reviewType); // queryWrapper.eq(OcrField::getReviewType, reviewType);
queryWrapper.eq(OcrField::getDel, 0); // queryWrapper.eq(OcrField::getDel, 0);
List<OcrField> ocrFieldList = this.list(queryWrapper); // List<OcrField> ocrFieldList = this.list(queryWrapper);
if(ocrFieldList.size()>0){ // if(ocrFieldList.size()>0){
for (OcrField ocrField : ocrFieldList) { // for (OcrField ocrField : ocrFieldList) {
OcrFieldDto dto = new OcrFieldDto(); // OcrFieldDto dto = new OcrFieldDto();
BeanUtils.copyProperties(dto, ocrField); // BeanUtils.copyProperties(dto, ocrField);
ocrFieldDtoList.add(dto); // ocrFieldDtoList.add(dto);
} // }
} // }
} catch (BeansException e) { // } catch (BeansException e) {
e.printStackTrace(); // e.printStackTrace();
} // }
return ocrFieldDtoList; // return ocrFieldDtoList;
} // }
//
} //}

@ -1,21 +1,21 @@
package cn.jyjz.xiaoyao.ocr.service.impl; //package cn.jyjz.xiaoyao.ocr.service.impl;
//
import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl; //import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl;
import cn.jyjz.xiaoyao.ocr.dataDao.OcrUserFieldMybatisDao; //import cn.jyjz.xiaoyao.ocr.dataDao.OcrUserFieldMybatisDao;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrUserField; //import cn.jyjz.xiaoyao.ocr.dataobject.OcrUserField;
import cn.jyjz.xiaoyao.ocr.service.OcrUserFieldService; //import cn.jyjz.xiaoyao.ocr.service.OcrUserFieldService;
import lombok.extern.slf4j.Slf4j; //import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; //import org.springframework.stereotype.Service;
//
//
/** ///**
* //* 业务层实现
*/ //*/
@Service //@Service
@Slf4j //@Slf4j
public class OcrUserFieldServiceImpl extends BaseServiceImpl<OcrUserFieldMybatisDao, OcrUserField> implements OcrUserFieldService { //public class OcrUserFieldServiceImpl extends BaseServiceImpl<OcrUserFieldMybatisDao, OcrUserField> implements OcrUserFieldService {
@Autowired // @Autowired
private OcrUserFieldMybatisDao ocrUserFieldMybatisDao; // private OcrUserFieldMybatisDao ocrUserFieldMybatisDao;
//
} //}

@ -1,46 +1,46 @@
package cn.jyjz.xiaoyao.ocr.vo; //package cn.jyjz.xiaoyao.ocr.vo;
//
import com.fasterxml.jackson.annotation.JsonFormat; //import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema; //import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; //import lombok.AllArgsConstructor;
import lombok.Builder; //import lombok.Builder;
import lombok.Data; //import lombok.Data;
import lombok.NoArgsConstructor; //import lombok.NoArgsConstructor;
//
import java.io.Serializable; //import java.io.Serializable;
//
@Data //@Data
@Builder //@Builder
@NoArgsConstructor //@NoArgsConstructor
@AllArgsConstructor //@AllArgsConstructor
@Schema(name = "字段信息", title = "字段信息") //@Schema(name = "字段信息", title = "字段信息")
public class OcrFieldVo implements Serializable { //public class OcrFieldVo implements Serializable {
private static final long serialVersionUID = 8088861709460050761L; // private static final long serialVersionUID = 8088861709460050761L;
@Schema(description = "主键") // @Schema(description = "主键")
private Long id; // private Long id;
//
@Schema(description = "字段名称") // @Schema(description = "字段名称")
private String name; // private String name;
//
@Schema(description = "字段类型一审1二审2终审0") // @Schema(description = "字段类型一审1二审2终审0")
private Integer reviewType; // private Integer reviewType;
//
@Schema(description = "字段描述") // @Schema(description = "字段描述")
private String fieldDesc; // private String fieldDesc;
//
@Schema(description = "创建人") // @Schema(description = "创建人")
private String createBy; // private String createBy;
//
@Schema(description = "创建时间") // @Schema(description = "创建时间")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") // @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Data createTime; // private Data createTime;
//
@Schema(description = "修改人") // @Schema(description = "修改人")
private String updateBy; // private String updateBy;
//
@Schema(description = "修改时间") // @Schema(description = "修改时间")
private Data updateTime; // private Data updateTime;
//
@Schema(description = "是否删除0未删除1:已删除") // @Schema(description = "是否删除0未删除1:已删除")
private Integer del; // private Integer del;
} //}

@ -1,51 +1,51 @@
package cn.jyjz.xiaoyao.ocr.vo; //package cn.jyjz.xiaoyao.ocr.vo;
//
import com.baomidou.mybatisplus.annotation.TableName; //import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; //import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema; //import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; //import lombok.AllArgsConstructor;
import lombok.Builder; //import lombok.Builder;
import lombok.Data; //import lombok.Data;
import lombok.NoArgsConstructor; //import lombok.NoArgsConstructor;
//
import java.io.Serializable; //import java.io.Serializable;
//
@Data //@Data
@Builder //@Builder
@NoArgsConstructor //@NoArgsConstructor
@AllArgsConstructor //@AllArgsConstructor
@Schema(name = "用户-展示字段", title = "用户-展示字段") //@Schema(name = "用户-展示字段", title = "用户-展示字段")
@TableName(value = "ocr_user_field") //@TableName(value = "ocr_user_field")
public class OcrUserFieldVo implements Serializable { //public class OcrUserFieldVo implements Serializable {
private static final long serialVersionUID = 8088861709460050761L; // private static final long serialVersionUID = 8088861709460050761L;
@Schema(description = "主键") // @Schema(description = "主键")
private Long id; // private Long id;
//
@Schema(description = "用户ID") // @Schema(description = "用户ID")
private long userId; // private long userId;
//
@Schema(description = "评审类型一审1二审2终审0") // @Schema(description = "评审类型一审1二审2终审0")
private Integer reviewType; // private Integer reviewType;
//
@Schema(description = "展示字段字符串") // @Schema(description = "展示字段字符串")
private String userField; // private String userField;
//
@Schema(description = "创建人") // @Schema(description = "创建人")
private String createBy; // private String createBy;
//
@Schema(description = "创建时间") // @Schema(description = "创建时间")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") // @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Data createTime; // private Data createTime;
//
@Schema(description = "修改人") // @Schema(description = "修改人")
private String updateBy; // private String updateBy;
//
@Schema(description = "修改时间") // @Schema(description = "修改时间")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") // @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Data updateTime; // private Data updateTime;
//
@Schema(description = "是否删除0未删除1:已删除") // @Schema(description = "是否删除0未删除1:已删除")
private Integer del; // private Integer del;
} //}
//
//

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8" ?> <!--<?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"> <!--<!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.OcrFieldMybatisDao"> <!--<mapper namespace="cn.jyjz.xiaoyao.ocr.dataDao.OcrFieldMybatisDao">-->
<resultMap id="BaseResultMap" type="cn.jyjz.xiaoyao.ocr.dataobject.OcrField"> <!-- <resultMap id="BaseResultMap" type="cn.jyjz.xiaoyao.ocr.dataobject.OcrField">-->
<id column="id" property="id" jdbcType="BIGINT"/> <!-- <id column="id" property="id" jdbcType="BIGINT"/>-->
<result column="name" property="name" jdbcType="VARCHAR"/> <!-- <result column="name" property="name" jdbcType="VARCHAR"/>-->
<result column="review_type" property="reviewType" jdbcType="INTEGER"/> <!-- <result column="review_type" property="reviewType" jdbcType="INTEGER"/>-->
<result column="field_desc" property="fieldDesc" jdbcType="VARCHAR"/> <!-- <result column="field_desc" property="fieldDesc" jdbcType="VARCHAR"/>-->
<result column="create_by" property="createBy" jdbcType="VARCHAR"/> <!-- <result column="create_by" property="createBy" jdbcType="VARCHAR"/>-->
<result column="create_time" property="createTime" jdbcType="TIMESTAMP"/> <!-- <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>-->
<result column="update_by" property="updateBy" jdbcType="VARCHAR"/> <!-- <result column="update_by" property="updateBy" jdbcType="VARCHAR"/>-->
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/> <!-- <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>-->
<result column="del" property="del" jdbcType="INTEGER"/> <!-- <result column="del" property="del" jdbcType="INTEGER"/>-->
</resultMap> <!-- </resultMap>-->
</mapper> <!--</mapper>-->

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8" ?> <!--<?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"> <!--<!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.OcrUserFieldMybatisDao"> <!--<mapper namespace="cn.jyjz.xiaoyao.ocr.dataDao.OcrUserFieldMybatisDao">-->
<resultMap id="BaseResultMap" type="cn.jyjz.xiaoyao.ocr.dataobject.OcrUserField"> <!-- <resultMap id="BaseResultMap" type="cn.jyjz.xiaoyao.ocr.dataobject.OcrUserField">-->
<id column="id" property="id" jdbcType="BIGINT"/> <!-- <id column="id" property="id" jdbcType="BIGINT"/>-->
<result column="user_id" property="userId" jdbcType="BIGINT"/> <!-- <result column="user_id" property="userId" jdbcType="BIGINT"/>-->
<result column="review_type" property="reviewType" jdbcType="INTEGER"/> <!-- <result column="review_type" property="reviewType" jdbcType="INTEGER"/>-->
<result column="user_field" property="userField" jdbcType="VARCHAR"/> <!-- <result column="user_field" property="userField" jdbcType="VARCHAR"/>-->
<result column="create_by" property="createBy" jdbcType="VARCHAR"/> <!-- <result column="create_by" property="createBy" jdbcType="VARCHAR"/>-->
<result column="create_time" property="createTime" jdbcType="TIMESTAMP"/> <!-- <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>-->
<result column="update_by" property="updateBy" jdbcType="VARCHAR"/> <!-- <result column="update_by" property="updateBy" jdbcType="VARCHAR"/>-->
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/> <!-- <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>-->
<result column="del" property="del" jdbcType="INTEGER"/> <!-- <result column="del" property="del" jdbcType="INTEGER"/>-->
</resultMap> <!-- </resultMap>-->
</mapper> <!--</mapper>-->

@ -104,7 +104,7 @@ flowable:
deployment-api-url: http://127.0.0.1:9090/foodapi/flowable-task/app-api deployment-api-url: http://127.0.0.1:9090/foodapi/flowable-task/app-api
#关闭定时任务JOB #关闭定时任务JOB
async-executor-activate: false async-executor-activate: false
database-schema-update: false database-schema-update: true
# #
# cache: # cache:
# type: redis # type: redis

Loading…
Cancel
Save