From 113e271389ac5f8cfb60fe8e1e71a8d82403dd71 Mon Sep 17 00:00:00 2001 From: DELL Date: Fri, 15 Mar 2024 11:29:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocr/controller/OcrFieldController.java | 49 +++++++++++++ .../controller/OcrUserFieldController.java | 15 ++++ .../ocr/dataDao/OcrFieldMybatisDao.java | 13 ++++ .../ocr/dataDao/OcrUserFieldMybatisDao.java | 13 ++++ .../jyjz/xiaoyao/ocr/dataobject/OcrField.java | 66 ++++++++++++++++++ .../xiaoyao/ocr/dataobject/OcrUserField.java | 68 +++++++++++++++++++ .../cn/jyjz/xiaoyao/ocr/dto/OcrFieldDto.java | 47 +++++++++++++ .../jyjz/xiaoyao/ocr/dto/OcrUserFieldDto.java | 51 ++++++++++++++ .../xiaoyao/ocr/service/OcrFieldService.java | 18 +++++ .../ocr/service/OcrUserFieldService.java | 11 +++ .../ocr/service/impl/OcrFieldServiceImpl.java | 49 +++++++++++++ .../service/impl/OcrUserFieldServiceImpl.java | 21 ++++++ .../cn/jyjz/xiaoyao/ocr/vo/OcrFieldVo.java | 46 +++++++++++++ .../jyjz/xiaoyao/ocr/vo/OcrUserFieldVo.java | 51 ++++++++++++++ .../resources/mapper/oa/OcrFieldMapper.xml | 15 ++++ .../mapper/oa/OcrUserFieldMapper.xml | 15 ++++ .../src/main/resources/application-dev.yml | 22 +++--- 17 files changed, 559 insertions(+), 11 deletions(-) create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrFieldController.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUserFieldController.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrFieldMybatisDao.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrUserFieldMybatisDao.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrField.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrUserField.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dto/OcrFieldDto.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dto/OcrUserFieldDto.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrFieldService.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrUserFieldService.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrFieldServiceImpl.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUserFieldServiceImpl.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrFieldVo.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrUserFieldVo.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrFieldMapper.xml create mode 100644 jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrUserFieldMapper.xml diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrFieldController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrFieldController.java new file mode 100644 index 0000000..e018061 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrFieldController.java @@ -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(HttpServletRequest req, @Schema(description = "字段类型（一审：1，二审：2，终审：0）") Integer reviewType) { + ResultVo> resultVo = new ResultVo<>(); + List ocrFieldDtos = ocrFieldService.list(reviewType); + resultVo.addOK(ocrFieldDtos); + return resultVo; + } +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUserFieldController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUserFieldController.java new file mode 100644 index 0000000..7a9c110 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUserFieldController.java @@ -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()); + +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrFieldMybatisDao.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrFieldMybatisDao.java new file mode 100644 index 0000000..54e8d94 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrFieldMybatisDao.java @@ -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 { +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrUserFieldMybatisDao.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrUserFieldMybatisDao.java new file mode 100644 index 0000000..d34d6ba --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrUserFieldMybatisDao.java @@ -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 { +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrField.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrField.java new file mode 100644 index 0000000..a07ca71 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrField.java @@ -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; +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrUserField.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrUserField.java new file mode 100644 index 0000000..40d5e51 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrUserField.java @@ -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; +} + + diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dto/OcrFieldDto.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dto/OcrFieldDto.java new file mode 100644 index 0000000..8b7f57f --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dto/OcrFieldDto.java @@ -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; +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dto/OcrUserFieldDto.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dto/OcrUserFieldDto.java new file mode 100644 index 0000000..9216161 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dto/OcrUserFieldDto.java @@ -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; +} + + diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrFieldService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrFieldService.java new file mode 100644 index 0000000..27e5d93 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrFieldService.java @@ -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 { + + /** + * 自定义筛选字段列表查询 + */ + List list(Integer reviewType); +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrUserFieldService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrUserFieldService.java new file mode 100644 index 0000000..4f7e126 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrUserFieldService.java @@ -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 { + +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrFieldServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrFieldServiceImpl.java new file mode 100644 index 0000000..77bb68b --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrFieldServiceImpl.java @@ -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 implements OcrFieldService { + @Autowired + private OcrFieldMybatisDao ocrFieldMybatisDao; + + @Override + public List list(Integer reviewType){ + List ocrFieldDtoList = null; + try { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OcrField::getReviewType, reviewType); + queryWrapper.eq(OcrField::getDel, 0); + List 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; + } + +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUserFieldServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUserFieldServiceImpl.java new file mode 100644 index 0000000..37d1edd --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUserFieldServiceImpl.java @@ -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 implements OcrUserFieldService { + @Autowired + private OcrUserFieldMybatisDao ocrUserFieldMybatisDao; + +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrFieldVo.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrFieldVo.java new file mode 100644 index 0000000..fbee578 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrFieldVo.java @@ -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; +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrUserFieldVo.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrUserFieldVo.java new file mode 100644 index 0000000..d4a20bf --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrUserFieldVo.java @@ -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; +} + + diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrFieldMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrFieldMapper.xml new file mode 100644 index 0000000..f745cfe --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrFieldMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrUserFieldMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrUserFieldMapper.xml new file mode 100644 index 0000000..691f178 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrUserFieldMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/runstart/src/main/resources/application-dev.yml b/runstart/src/main/resources/application-dev.yml index bcc138c..d467a92 100644 --- a/runstart/src/main/resources/application-dev.yml +++ b/runstart/src/main/resources/application-dev.yml @@ -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 \ No newline at end of file +debugger_tools: true