pull/1/head
DELL 1 year ago
parent 163e264375
commit 113e271389

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

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

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

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

@ -0,0 +1,66 @@
package cn.jyjz.xiaoyao.ocr.dataobject;
import cn.jyjz.xiaoyao.admin.dataobject.Tenant;
import cn.jyjz.xiaoyao.common.base.jsonDomain.DateSerializer;
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.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 = "字段信息")
@TableName(value = "ocr_field")
public class OcrField implements 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="name")
private String name;
@Schema(description = "字段类型一审1二审2终审0")
@TableField(value="review_type")
private Integer reviewType;
@Schema(description = "字段描述")
@TableField(value="field_desc")
private String fieldDesc;
@Schema(description = "创建人")
@TableField(value="create_by")
private String createBy;
@Schema(description = "创建时间")
@TableField(value="create_time")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Data 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 Data updateTime;
@Schema(description = "是否删除0未删除1:已删除")
@TableField(value="del")
private Integer del;
}

@ -0,0 +1,68 @@
package cn.jyjz.xiaoyao.ocr.dataobject;
import cn.jyjz.xiaoyao.admin.dataobject.Tenant;
import cn.jyjz.xiaoyao.common.base.jsonDomain.DateSerializer;
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.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 = "用户-展示字段")
@TableName(value = "ocr_user_field")
public class OcrUserField implements Serializable {
private static final long serialVersionUID = 8088861709460050761L;
@Schema(description = "主键")
@TableId(value = "id",type = IdType.AUTO)
@TableField(value="id")
private Long id;
@Schema(description = "用户ID")
@TableField(value="user_id")
private long userId;
@Schema(description = "评审类型一审1二审2终审0")
@TableField(value="review_type")
private Integer reviewType;
@Schema(description = "展示字段字符串")
@TableField(value="user_field")
private String userField;
@Schema(description = "创建人")
@TableField(value="create_by")
private String createBy;
@Schema(description = "创建时间")
@TableField(value="create_time")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Data 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 Data updateTime;
@Schema(description = "是否删除0未删除1:已删除")
@TableField(value="del")
private Integer del;
}

@ -0,0 +1,47 @@
package cn.jyjz.xiaoyao.ocr.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
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 OcrFieldDto implements Serializable {
private static final long serialVersionUID = 8088861709460050761L;
@Schema(description = "主键")
private Long id;
@Schema(description = "字段名称")
private String name;
@Schema(description = "字段类型一审1二审2终审0")
private Integer reviewType;
@Schema(description = "字段描述")
private String fieldDesc;
@Schema(description = "创建人")
private String createBy;
@Schema(description = "创建时间")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Data createTime;
@Schema(description = "修改人")
private String updateBy;
@Schema(description = "修改时间")
private Data updateTime;
@Schema(description = "是否删除0未删除1:已删除")
private Integer del;
}

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

@ -0,0 +1,18 @@
package cn.jyjz.xiaoyao.ocr.service;
import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrField;
import cn.jyjz.xiaoyao.ocr.dto.OcrFieldDto;
import java.util.List;
/**
*
*/
public interface OcrFieldService extends BaseService<OcrField> {
/**
*
*/
List<OcrFieldDto> list(Integer reviewType);
}

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

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

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

@ -0,0 +1,46 @@
package cn.jyjz.xiaoyao.ocr.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
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 OcrFieldVo implements Serializable {
private static final long serialVersionUID = 8088861709460050761L;
@Schema(description = "主键")
private Long id;
@Schema(description = "字段名称")
private String name;
@Schema(description = "字段类型一审1二审2终审0")
private Integer reviewType;
@Schema(description = "字段描述")
private String fieldDesc;
@Schema(description = "创建人")
private String createBy;
@Schema(description = "创建时间")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Data createTime;
@Schema(description = "修改人")
private String updateBy;
@Schema(description = "修改时间")
private Data updateTime;
@Schema(description = "是否删除0未删除1:已删除")
private Integer del;
}

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

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

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

@ -23,10 +23,10 @@ spring:
primary: master
datasource:
master:
url: jdbc:mysql://127.0.0.1:3306/ocr?useUnicode=true&nullCatalogMeansCurrent=true&characterEncoding=UTF-8&characterSetResults=utf8&serverTimezone=Asia/Shanghai&useSSL=false
url: jdbc:mysql://47.93.59.251:3306/ocrnew?useUnicode=true&nullCatalogMeansCurrent=true&characterEncoding=UTF-8&characterSetResults=utf8&serverTimezone=Asia/Shanghai&useSSL=false
driver-class-name: com.mysql.cj.jdbc.Driver
username: jyjz
password: jyjz
username: ysltest
password: ysltest2024.
type: com.alibaba.druid.pool.DruidDataSource
slave:
url: jdbc:mysql://127.0.0.1:3306/ocr?useUnicode=true&nullCatalogMeansCurrent=true&characterEncoding=UTF-8&characterSetResults=utf8&serverTimezone=Asia/Shanghai&useSSL=false
@ -104,7 +104,7 @@ flowable:
deployment-api-url: http://127.0.0.1:9090/foodapi/flowable-task/app-api
#关闭定时任务JOB
async-executor-activate: false
database-schema-update: true
database-schema-update: false
#
# cache:
# type: redis
@ -140,7 +140,7 @@ flowable:
mybatis:
mapper-locations:
- classpath*:mapper/**/*.xml
# - classpath*:/META-INF/modeler-mybatis-mappings/*.xml
# - classpath*:/META-INF/modeler-mybatis-mappings/*.xml
configuration:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
configuration-properties:
@ -161,15 +161,15 @@ mybatis-plus:
xiaoyao:
web:
#上传文件路径
uploadPath: D:/ideaWork/jeecg/ocrproject/htmlweb/upload
uploadPath: D:/Code/ocr/htmlweb/upload
#页面根路径
frontPath: D:/ideaWork/jeecg/ocrproject/htmlweb
frontPath: D:/Code/ocr/htmlweb
#js、css、图片存放路径
staticPath: D:/ideaWork/jeecg/ocrproject/htmlweb/static
staticPath: D:/Code/ocr/htmlweb/static
#页面模版路径
webPath: D:/ideaWork/jeecg/ocrproject/htmlweb/web
webPath: D:/Code/ocr/htmlweb/web
#Lucene索引路径
lucenePath: D:/ideaWork/jeecg/ocrproject/htmlweb/lucene/indexDir
lucenePath: D:/Code/ocr/htmlweb/lucene/indexDir
#是否开启flowable
haveFlowable: true
webconfig:
@ -272,4 +272,4 @@ springfox:
swagger-ui:
enabled: true
# 是否启用swagger,postman调试
debugger_tools: true
debugger_tools: true

Loading…
Cancel
Save