From 113e271389ac5f8cfb60fe8e1e71a8d82403dd71 Mon Sep 17 00:00:00 2001 From: DELL Date: Fri, 15 Mar 2024 11:29:28 +0800 Subject: [PATCH 01/23] =?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 00000000..e0180613 --- /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 00000000..7a9c1106 --- /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 00000000..54e8d942 --- /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 00000000..d34d6bae --- /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 00000000..a07ca716 --- /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 00000000..40d5e515 --- /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 00000000..8b7f57fd --- /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 00000000..92161613 --- /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 00000000..27e5d93f --- /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 00000000..4f7e126f --- /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 00000000..77bb68b6 --- /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 00000000..37d1edde --- /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 00000000..fbee578f --- /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 00000000..d4a20bf3 --- /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 00000000..f745cfec --- /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 00000000..691f178f --- /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 bcc138c3..d467a92d 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 From 97a87fdec919ded3a6c89ea9cec452ada8896cd9 Mon Sep 17 00:00:00 2001 From: DELL Date: Fri, 15 Mar 2024 11:49:42 +0800 Subject: [PATCH 02/23] =?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 | 98 ++++++------- .../controller/OcrUserFieldController.java | 30 ++-- .../ocr/dataDao/OcrFieldMybatisDao.java | 26 ++-- .../ocr/dataDao/OcrUserFieldMybatisDao.java | 26 ++-- .../jyjz/xiaoyao/ocr/dataobject/OcrField.java | 132 ++++++++--------- .../xiaoyao/ocr/dataobject/OcrUserField.java | 136 +++++++++--------- .../cn/jyjz/xiaoyao/ocr/dto/OcrFieldDto.java | 94 ++++++------ .../jyjz/xiaoyao/ocr/dto/OcrUserFieldDto.java | 102 ++++++------- .../xiaoyao/ocr/service/OcrFieldService.java | 36 ++--- .../ocr/service/OcrUserFieldService.java | 22 +-- .../ocr/service/impl/OcrFieldServiceImpl.java | 98 ++++++------- .../service/impl/OcrUserFieldServiceImpl.java | 42 +++--- .../cn/jyjz/xiaoyao/ocr/vo/OcrFieldVo.java | 92 ++++++------ .../jyjz/xiaoyao/ocr/vo/OcrUserFieldVo.java | 102 ++++++------- .../resources/mapper/oa/OcrFieldMapper.xml | 30 ++-- .../mapper/oa/OcrUserFieldMapper.xml | 30 ++-- .../src/main/resources/application-dev.yml | 6 +- 17 files changed, 551 insertions(+), 551 deletions(-) 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 index e0180613..57e14b9b 100644 --- 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 @@ -1,49 +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; - } -} +//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 index 7a9c1106..6514f2e1 100644 --- 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 @@ -1,15 +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()); - -} +//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 index 54e8d942..14bcad54 100644 --- 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 @@ -1,13 +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 { -} +//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 index d34d6bae..cd8141f6 100644 --- 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 @@ -1,13 +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 { -} +//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 index a07ca716..2aac7fa5 100644 --- 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 @@ -1,66 +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; -} +//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 index 40d5e515..334a213d 100644 --- 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 @@ -1,68 +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; -} - - +//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 index 8b7f57fd..f3ebcb0f 100644 --- 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 @@ -1,47 +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; -} +//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 index 92161613..25e9d2fe 100644 --- 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 @@ -1,51 +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; -} - - +//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 index 27e5d93f..470dea58 100644 --- 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 @@ -1,18 +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); -} +//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 index 4f7e126f..265a5197 100644 --- 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 @@ -1,11 +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 { - -} +//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 index 77bb68b6..c1b64d30 100644 --- 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 @@ -1,49 +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; - } - -} +//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 index 37d1edde..6cd7f44e 100644 --- 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 @@ -1,21 +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; - -} +//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 index fbee578f..cf496adf 100644 --- 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 @@ -1,46 +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; -} +//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 index d4a20bf3..b25241b0 100644 --- 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 @@ -1,51 +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; -} - - +//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 index f745cfec..0e912481 100644 --- 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 @@ -1,15 +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 index 691f178f..bd0cdb45 100644 --- 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 @@ -1,15 +1,15 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/runstart/src/main/resources/application-dev.yml b/runstart/src/main/resources/application-dev.yml index d467a92d..c9ecbdb8 100644 --- a/runstart/src/main/resources/application-dev.yml +++ b/runstart/src/main/resources/application-dev.yml @@ -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: false + database-schema-update: true # # 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: @@ -272,4 +272,4 @@ springfox: swagger-ui: enabled: true # 是否启用swagger,postman调试 -debugger_tools: true +debugger_tools: true \ No newline at end of file From 43273a4cb3cd04f0fb0954ce9142ad28ce8b2777 Mon Sep 17 00:00:00 2001 From: DELL Date: Fri, 15 Mar 2024 20:22:55 +0800 Subject: [PATCH 03/23] =?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 --- .../JwtAuthenticationFilter.java | 14 +- .../ocr/controller/OcrFieldController.java | 144 +++++++++------ .../controller/OcrUserFieldController.java | 87 ++++++++-- .../ocr/dataDao/OcrFieldMybatisDao.java | 26 +-- .../ocr/dataDao/OcrUserFieldMybatisDao.java | 26 +-- .../jyjz/xiaoyao/ocr/dataobject/OcrField.java | 133 +++++++------- .../xiaoyao/ocr/dataobject/OcrUserField.java | 137 +++++++-------- .../cn/jyjz/xiaoyao/ocr/dto/OcrFieldDto.java | 82 ++++----- .../jyjz/xiaoyao/ocr/dto/OcrUserFieldDto.java | 85 ++++----- .../xiaoyao/ocr/service/OcrFieldService.java | 51 ++++-- .../ocr/service/OcrUserFieldService.java | 35 ++-- .../ocr/service/impl/OcrFieldServiceImpl.java | 164 ++++++++++++------ .../service/impl/OcrUserFieldServiceImpl.java | 95 +++++++--- .../cn/jyjz/xiaoyao/ocr/vo/OcrFieldVo.java | 93 +++++----- .../jyjz/xiaoyao/ocr/vo/OcrUserFieldVo.java | 102 +++++------ .../resources/mapper/oa/OcrFieldMapper.xml | 30 ++-- .../mapper/oa/OcrUserFieldMapper.xml | 30 ++-- .../src/main/resources/application-dev.yml | 8 +- 18 files changed, 785 insertions(+), 557 deletions(-) diff --git a/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/JwtAuthenticationFilter.java b/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/JwtAuthenticationFilter.java index 6724ea76..3abdfc81 100644 --- a/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/JwtAuthenticationFilter.java +++ b/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/JwtAuthenticationFilter.java @@ -58,15 +58,19 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter { String[] excludespath = systemopenurlService.getOpenUrl(); //不需要过滤的url - String[] excludesOther = {"/static","/json",".js",".css",".ico",".jpg",".png",".pcm","/","/druid"}; + String[] excludesOther = {"/static","/json",".js",".css",".ico",".jpg",".png",".pcm","/druid"}; String[] urls = ArrayUtils.addAll(excludespath, excludesOther); boolean flag = true; - for (String str : urls) { - if (spath.indexOf(str) != -1) { - flag =false; - break; + if("/".equalsIgnoreCase(spath)) { + flag = false; + }else{ + for (String str : urls) { + if (spath.indexOf(str) != -1) { + flag = false; + break; + } } } if(flag){ 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 index 57e14b9b..ac128912 100644 --- 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 @@ -1,49 +1,95 @@ -//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; -// } -//} +package cn.jyjz.xiaoyao.ocr.controller; + +import cn.jyjz.xiaoyao.common.base.controller.BaseController; +import cn.jyjz.xiaoyao.common.base.vo.ResultVo; +import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrField; +import cn.jyjz.xiaoyao.ocr.dto.OcrFieldDto; +import cn.jyjz.xiaoyao.ocr.service.OcrFieldService; +import cn.jyjz.xiaoyao.ocr.vo.OcrFieldVo; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +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(@RequestParam(name="reviewType") Integer reviewType) { + ResultVo> resultVo = new ResultVo<>(); + List ocrFieldDtos = ocrFieldService.list(reviewType); + resultVo.setData(ocrFieldDtos); + resultVo.addOK("查询成功"); + return resultVo; + } + + /** + * 自定义筛选字段列表查询全部 + * @return + */ + @ApiOperation(value="自定义筛选字段列表查询", notes="自定义筛选字段列表查询") + @GetMapping(value = "/listAll") + public ResultVo> listAll() { + ResultVo> resultVo = new ResultVo<>(); + List ocrFieldDtos = ocrFieldService.listAll(); + resultVo.setData(ocrFieldDtos); + resultVo.addOK("查询成功"); + return resultVo; + } + + /** + * 根据字段ID删除自定义筛选字段 + * @return + */ + @ApiOperation(value="删除自定义筛选字段", notes="删除自定义筛选字段") + @GetMapping(value = "/delete") + public ResultVo delete(@RequestParam(name="id") Long id) { + + OcrFieldDto ocrFieldDto = ocrFieldService.delete(id); + if(ocrFieldDto != null){ + return ResultVoUtil.success(); + } + return ResultVoUtil.error("删除失败"); + } + + /** + * 自定义筛选字段新增和修改 + * @return + */ + @ApiOperation(value="自定义筛选字段新增和修改", notes="自定义筛选字段新增和修改") + @PostMapping(value = "/saveOrUpdate") + public ResultVo saveOrUpdate(OcrFieldVo ocrFieldVo) { + try { + OcrField ocrField = new OcrField(); + ocrField.setId(ocrFieldVo.getId()); + ocrField.setName(ocrFieldVo.getName()); + ocrField.setReviewType(ocrFieldVo.getReviewType()); + ocrField.setFieldDesc(ocrFieldVo.getFieldDesc()); + ocrField.setCreateBy(ocrFieldVo.getCreateBy()); + ocrField.setCreateTime(ocrFieldVo.getCreateTime()); + ocrField.setUpdateBy(ocrFieldVo.getUpdateBy()); + ocrField.setUpdateTime(ocrFieldVo.getUpdateTime()); + ocrFieldService.saveData(ocrField); + } catch (BeansException e) { + e.printStackTrace(); + } + return ResultVoUtil.success(); + } + +} 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 index 6514f2e1..e843ff03 100644 --- 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 @@ -1,15 +1,72 @@ -//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()); -// -//} +package cn.jyjz.xiaoyao.ocr.controller; + +import cn.jyjz.xiaoyao.common.base.controller.BaseController; +import cn.jyjz.xiaoyao.common.base.vo.ResultVo; +import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrField; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrUserField; +import cn.jyjz.xiaoyao.ocr.dto.OcrFieldDto; +import cn.jyjz.xiaoyao.ocr.dto.OcrUserFieldDto; +import cn.jyjz.xiaoyao.ocr.service.OcrFieldService; +import cn.jyjz.xiaoyao.ocr.service.OcrUserFieldService; +import cn.jyjz.xiaoyao.ocr.vo.OcrFieldVo; +import cn.jyjz.xiaoyao.ocr.vo.OcrUserFieldVo; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/ocr/user/field") +public class OcrUserFieldController extends BaseController{ + + private Logger log = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private OcrUserFieldService ocrUserFieldService; + + /** + * 保存或更新用户展示字段列表 + * @return + */ + @ApiOperation(value="保存或更新用户展示字段列表", notes="保存或更新用户展示字段列表") + @PostMapping(value = "/saveOrUpdate") + public ResultVo saveOrUpdate(OcrUserFieldVo ocrUserFieldVo) { + try { + OcrUserField ocrUserField = new OcrUserField(); + ocrUserField.setId(ocrUserFieldVo.getId()); + ocrUserField.setUserId(ocrUserFieldVo.getUserId()); + ocrUserField.setReviewType(ocrUserFieldVo.getReviewType()); + ocrUserField.setUserField(ocrUserFieldVo.getUserField()); + ocrUserField.setCreateBy(ocrUserFieldVo.getCreateBy()); + ocrUserField.setCreateTime(ocrUserFieldVo.getCreateTime()); + ocrUserField.setUpdateBy(ocrUserFieldVo.getUpdateBy()); + ocrUserField.setUpdateTime(ocrUserFieldVo.getUpdateTime()); + ocrUserFieldService.saveData(ocrUserField); + } catch (BeansException e) { + e.printStackTrace(); + } + return ResultVoUtil.success(); + } + + /** + * 用户-筛选字段查询 + * @return + */ + @ApiOperation(value="自定义筛选字段列表查询", notes="自定义筛选字段列表查询") + @GetMapping(value = "/queryFields") + public ResultVo queryFields(@RequestParam(name="userId") Long userId ,@RequestParam(name="reviewType") Integer reviewType) { + ResultVo resultVo = new ResultVo<>(); + OcrUserFieldDto ocrUserFieldDto = ocrUserFieldService.queryFields(userId,reviewType); + resultVo.setData(ocrUserFieldDto); + resultVo.addOK("查询成功"); + return resultVo; + } + + +} 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 index 14bcad54..54e8d942 100644 --- 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 @@ -1,13 +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 { -//} +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 index cd8141f6..d34d6bae 100644 --- 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 @@ -1,13 +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 { -//} +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 index 2aac7fa5..e7afeabd 100644 --- 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 @@ -1,66 +1,67 @@ -//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; -//} +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; +import java.sql.Date; + +@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 = "字段类型（终审:0，工单：1、一审二审:2、审核填报:3）") + @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 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; + + @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 index 334a213d..1b5ad9c6 100644 --- 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 @@ -1,68 +1,69 @@ -//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; -//} -// -// +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; +import java.sql.Date; + +@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 = "评审类型（终审:0，工单：1、一审二审:2、审核填报:3）") + @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 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; + + @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 index f3ebcb0f..cf759864 100644 --- 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 @@ -1,47 +1,35 @@ -//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; -//} +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; +import java.sql.Date; + +@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 = "字段类型（终审:0，工单：1、一审二审:2、审核填报:3）") + private Integer reviewType; + + @Schema(description = "字段描述") + private String fieldDesc; + + @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 index 25e9d2fe..e4b408ca 100644 --- 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 @@ -1,51 +1,34 @@ -//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; -//} -// -// +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; +import java.sql.Date; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Schema(name = "用户-展示字段", title = "用户-展示字段") +public class OcrUserFieldDto implements Serializable { + private static final long serialVersionUID = 8088861709460050761L; + @Schema(description = "主键") + private Long id; + + @Schema(description = "用户ID") + private long userId; + + @Schema(description = "评审类型（终审:0，工单：1、一审二审:2、审核填报:3）") + private Integer reviewType; + + @Schema(description = "展示字段字符串") + private String userField; +} + + 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 index 470dea58..2050712a 100644 --- 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 @@ -1,18 +1,33 @@ -//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); -//} +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 cn.jyjz.xiaoyao.ocr.vo.OcrFieldVo; + +import java.util.List; + +/** +* 业务层 +*/ +public interface OcrFieldService extends BaseService { + + /** + * 自定义筛选字段列表查询 + */ + List list(Integer reviewType); + + /** + * 自定义筛选字段列表查询全部 + */ + List listAll(); + + /** + * 删除自定义筛选字段 + */ + OcrFieldDto delete(Long id); + /** + * 自定义筛选字段新增和修改 + */ + void saveData(OcrField ocrField); +} 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 index 265a5197..8f5d4ea0 100644 --- 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 @@ -1,11 +1,24 @@ -//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 { -// -//} +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.dataobject.OcrUserField; +import cn.jyjz.xiaoyao.ocr.dto.OcrUserFieldDto; + +import java.util.List; + +/** +* 业务层 +*/ +public interface OcrUserFieldService extends BaseService { + /** + * 自定义筛选字段新增和修改 + */ + void saveData(OcrUserField ocrUserField); + + /** + * 用户-筛选字段查询 + */ + OcrUserFieldDto queryFields(Long userId,Integer reviewType); + +} 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 index c1b64d30..829ad333 100644 --- 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 @@ -1,49 +1,115 @@ -//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; -// } -// -//} +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 cn.jyjz.xiaoyao.ocr.vo.OcrFieldVo; +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 = new ArrayList<>(); + 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(); + dto.setId(ocrField.getId()); + dto.setName(ocrField.getName()); + dto.setReviewType(ocrField.getReviewType()); + dto.setFieldDesc(ocrField.getFieldDesc()); + ocrFieldDtoList.add(dto); + } + } + } catch (BeansException e) { + e.printStackTrace(); + } + return ocrFieldDtoList; + } + + @Override + public List listAll(){ + List ocrFieldDtoList = new ArrayList<>(); + try { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OcrField::getDel, 0); + List ocrFieldList = this.list(queryWrapper); + if(ocrFieldList.size()>0){ + for (OcrField ocrField : ocrFieldList) { + OcrFieldDto dto = new OcrFieldDto(); + dto.setId(ocrField.getId()); + dto.setName(ocrField.getName()); + dto.setReviewType(ocrField.getReviewType()); + dto.setFieldDesc(ocrField.getFieldDesc()); + ocrFieldDtoList.add(dto); + } + } + } catch (BeansException e) { + e.printStackTrace(); + } + return ocrFieldDtoList; + } + + @Override + public OcrFieldDto delete(Long id){ + try { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OcrField::getId, id); + OcrField ocrField = this.getOne(queryWrapper); + if (ocrField != null) { + // 将 del 字段值设置为 1，表示逻辑删除 + ocrField.setDel(1); + // 更新记录 + updateById(ocrField); + // 将更新后的记录转换为 DTO 对象返回 + OcrFieldDto ocrFieldDto = new OcrFieldDto(); + BeanUtils.copyProperties(ocrFieldDto, ocrField); + return ocrFieldDto; + } + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + @Override + public void saveData(OcrField ocrField){ + try { + String name = ocrField.getName(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OcrField::getName, name); + OcrField ocrFieldOne = this.getOne(queryWrapper); + if (ocrFieldOne != null) { + ocrField.setId(ocrFieldOne.getId()); // 设置 ID，以便更新指定记录 + updateById(ocrField); // 更新记录 + } else { + save(ocrField); // 保存记录 + } + } catch (Exception e) { + e.printStackTrace(); + } + } +} 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 index 6cd7f44e..85c612f2 100644 --- 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 @@ -1,21 +1,74 @@ -//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; -// -//} +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.OcrField; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrUserField; +import cn.jyjz.xiaoyao.ocr.dto.OcrUserFieldDto; +import cn.jyjz.xiaoyao.ocr.service.OcrUserFieldService; +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.sql.Date; +import java.sql.Timestamp; +import java.util.List; + + +/** +* 业务层实现 +*/ +@Service +@Slf4j +public class OcrUserFieldServiceImpl extends BaseServiceImpl implements OcrUserFieldService { + @Autowired + private OcrUserFieldMybatisDao ocrUserFieldMybatisDao; + + @Override + public void saveData(OcrUserField ocrUserField){ + try { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OcrUserField::getUserId,ocrUserField.getUserId()); + queryWrapper.eq(OcrUserField::getReviewType,ocrUserField.getReviewType()); + queryWrapper.eq(OcrUserField::getDel,0); + OcrUserField ocrUserFieldOne = this.getOne(queryWrapper); + long currentTimeMillis = System.currentTimeMillis(); + Timestamp timestamp = new Timestamp(currentTimeMillis); + Date currentDate = new Date(timestamp.getTime()); + if (ocrUserFieldOne != null) { + ocrUserField.setId(ocrUserFieldOne.getId()); + ocrUserField.setUpdateTime(currentDate); + this.updateById(ocrUserField); + } else { + ocrUserField.setCreateTime(currentDate); + ocrUserField.setUpdateTime(currentDate); + this.save(ocrUserField); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public OcrUserFieldDto queryFields(Long userId,Integer reviewType){ + OcrUserFieldDto dto = new OcrUserFieldDto(); + try { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OcrUserField::getUserId,userId); + queryWrapper.eq(OcrUserField::getReviewType,reviewType); + queryWrapper.eq(OcrUserField::getDel,0); + OcrUserField ocrUserFieldOne = this.getOne(queryWrapper); + dto.setId(ocrUserFieldOne.getId()); + dto.setUserId(ocrUserFieldOne.getUserId()); + dto.setReviewType(ocrUserFieldOne.getReviewType()); + dto.setUserField(ocrUserFieldOne.getUserField()); + } catch (BeansException e) { + e.printStackTrace(); + } + return dto; + } + +} 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 index cf496adf..1da0f92a 100644 --- 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 @@ -1,46 +1,47 @@ -//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; -//} +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; +import java.sql.Date; + +@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 = "字段类型（终审:0，工单：1、一审二审:2、审核填报:3）") + private Integer reviewType; + + @Schema(description = "字段描述") + private String fieldDesc; + + @Schema(description = "创建人") + private String createBy; + + @Schema(description = "创建时间") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + + @Schema(description = "修改人") + private String updateBy; + + @Schema(description = "修改时间") + private Date 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 index b25241b0..ec9bf9e4 100644 --- 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 @@ -1,51 +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; -//} -// -// +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; +import java.sql.Date; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Schema(name = "用户-展示字段", title = "用户-展示字段") +public class OcrUserFieldVo implements Serializable { + private static final long serialVersionUID = 8088861709460050761L; + @Schema(description = "主键") + private Long id; + + @Schema(description = "用户ID") + private long userId; + + @Schema(description = "评审类型（终审:0，工单：1、一审二审:2、审核填报:3）") + private Integer reviewType; + + @Schema(description = "展示字段字符串") + private String userField; + + @Schema(description = "创建人") + private String createBy; + + @Schema(description = "创建时间") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + + @Schema(description = "修改人") + private String updateBy; + + @Schema(description = "修改时间") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date 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 index 0e912481..f745cfec 100644 --- 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 @@ -1,15 +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 index bd0cdb45..ba749c64 100644 --- 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 @@ -1,15 +1,15 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/runstart/src/main/resources/application-dev.yml b/runstart/src/main/resources/application-dev.yml index c9ecbdb8..25c9be18 100644 --- a/runstart/src/main/resources/application-dev.yml +++ b/runstart/src/main/resources/application-dev.yml @@ -29,10 +29,10 @@ spring: 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 + 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 druid: # 初始连接数 @@ -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 From 8202e5526ed592181812f23c9ba59016cb2b1145 Mon Sep 17 00:00:00 2001 From: ljt <18301674552@163.com> Date: Sat, 16 Mar 2024 00:16:55 +0800 Subject: [PATCH 04/23] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=BF=AE=E6=94=B9pom.xml=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=BA=86=E4=B8=AA=E6=8F=92=E4=BB=B6=20=E6=96=B9=E4=BE=BF?= =?UTF-8?q?=E5=8F=8C=E8=A1=A8=E8=81=94=E6=9F=A5=E6=8B=BC=E6=8E=A5=20?= =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=90=9C=E7=B4=A2=E5=92=8C=E7=BB=BC=E5=90=88?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=9A=84=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=92=8C=E6=B8=85=E9=99=A4=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=20=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=96=B0?= =?UTF-8?q?=E8=A1=A8ocr=5Fsearch=5Fhistory=20=20=E7=BB=BC=E5=90=88?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8E=86=E5=8F=B2=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jyjz-system/jyjz-system-oa/pom.xml | 7 ++ .../ocr/controller/OcrMsgReadController.java | 41 ++++---- .../ocr/controller/OcrSUserTController.java | 9 +- .../OcrSearchHistoryController.java | 94 +++++++++++++++++++ .../xiaoyao/ocr/dataDao/OcrMsgMapper.java | 6 +- .../ocr/dataDao/OcrSearchHistoryMapper.java | 23 +++++ .../ocr/dataobject/OcrSearchHistory.java | 90 ++++++++++++++++++ .../xiaoyao/ocr/service/IOcrMsgService.java | 14 +++ .../ocr/service/IOcrSearchHistoryService.java | 20 ++++ .../ocr/service/impl/OcrMsgServiceImpl.java | 21 +++++ .../impl/OcrSearchHistoryServiceImpl.java | 31 ++++++ .../cn/jyjz/xiaoyao/ocr/util/PageRequest.java | 27 ++++++ .../main/resources/mapper/oa/OcrMsgMapper.xml | 65 +++++++++++++ .../mapper/oa/OcrSearchHistoryMapper.xml | 43 +++++++++ 14 files changed, 468 insertions(+), 23 deletions(-) create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSearchHistoryController.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrSearchHistory.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/PageRequest.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml diff --git a/jyjz-system/jyjz-system-oa/pom.xml b/jyjz-system/jyjz-system-oa/pom.xml index 1b31da99..d0e040ce 100644 --- a/jyjz-system/jyjz-system-oa/pom.xml +++ b/jyjz-system/jyjz-system-oa/pom.xml @@ -61,6 +61,13 @@ flowable-ui-modeler-logic + + + com.github.pagehelper + pagehelper-spring-boot-starter + + + org.flowable flowable-rest diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java index 6aef3ef1..1cc4afa0 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java @@ -8,9 +8,11 @@ import cn.jyjz.xiaoyao.oa.from.dataobject.Candidateuser; import cn.jyjz.xiaoyao.ocr.dataobject.OcrMsg; import cn.jyjz.xiaoyao.ocr.dataobject.OcrMsgRead; import cn.jyjz.xiaoyao.ocr.service.IOcrMsgService; +import cn.jyjz.xiaoyao.ocr.util.PageRequest; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.pagehelper.PageInfo; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -52,32 +54,29 @@ public class OcrMsgReadController { /** * 分页查询 - * @param map - * @param map start 起始页 - * @param map limit 每页显示多少条 默认10 条 * @return */ @ApiOperation(value = "系统消息分页", notes = "系统消息分页") - @RequestMapping(value = "/systempage", method = RequestMethod.GET) - public ResponseEntity systempage(HttpServletRequest request,@RequestBody Map map) { + @RequestMapping(value = "/systemPage", method = RequestMethod.GET) + public ResponseEntity systemPage(HttpServletRequest request, + @RequestParam(value = "pageNo", required = false, defaultValue = "1") int pageNo, + @RequestParam(value = "pageSize", required = false, defaultValue = "10") int pageSize, + @RequestParam(value = "msgCategory", required = false) String msgCategory) { - IPage iPage = new Page<>(Integer.valueOf(map.get("pageNo")),Integer.valueOf(map.get("pageSize"))); UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.select("id","titile","sender","bus_json","send_time").eq("msg_category",map.get("msgCategory")).eq("send_status","1").apply("FIND_IN_SET('"+userToken.getUsername()+"',receive_user_ids) UNION ALL select id,titile,bus_json,send_time from ocr_msg where receive_user_type='2' "); -// .select("id","titile","sender","bus_json","send_time").eq("send_status","2"); -// if(!StringUtils.isEmpty(map.get("productsId"))) { -// } - //执行查询方法 + //条件查询 + PageRequest pageQuery=new PageRequest(); + pageQuery.setPageNum(pageNo); + pageQuery.setPageSize(pageSize); - IPage page = this.iocrmsgservice.page(iPage,wrapper); + PageInfo>> findPage = iocrmsgservice.selectPage(pageQuery,userToken.getUserid(),msgCategory); - - return new ResponseEntity(page,HttpStatus.OK); + //执行查询方法 + return new ResponseEntity(findPage, HttpStatus.OK); } @@ -94,7 +93,7 @@ public class OcrMsgReadController { public ResponseEntity msgOne(@RequestParam(value = "id", required = false)String id) { QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.select("titile","msg_content","sender","msg_category","send_time"); + wrapper.select("titile","msg_content as msgContent","sender","msg_category as msgCategory","send_time as sendTime"); wrapper.eq("id", id); //执行查询方法 OcrMsg one = iocrmsgservice.getOne(wrapper); @@ -114,7 +113,7 @@ public class OcrMsgReadController { UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); QueryWrapper wrapperlist = new QueryWrapper<>(); - wrapperlist.select("id").eq("msg_category",msgCategory).eq("send_status","1").apply("FIND_IN_SET('"+userToken.getUsername()+"',receive_user_ids)"); + wrapperlist.select("id").eq("msg_category",msgCategory).eq("send_status","1").apply("FIND_IN_SET('"+userToken.getUserid()+"',receive_user_ids)"); QueryWrapper wrapperone = new QueryWrapper<>(); @@ -122,9 +121,9 @@ public class OcrMsgReadController { List list = iocrmsgservice.list(wrapperlist); for (OcrMsg msg:list){ - wrapperone.eq("msg_id", msg.getId()).eq("user_id",userToken.getUsername()); + wrapperone.eq("msg_id", msg.getId()).eq("user_id",userToken.getUserid()); OcrMsgRead one = ocrMsgReadService.getOne(wrapperone); - if(null!=one) { + if(null==one) { OcrMsgRead ocrmsgread=new OcrMsgRead(); ocrmsgread.setId(Long.valueOf(sdf.format(System.currentTimeMillis()))); ocrmsgread.setMsgId(msg.getId()); @@ -135,7 +134,7 @@ public class OcrMsgReadController { } } //此处需要手工处理 返回需要将修改后的数据返回 - return new ResponseEntity(HttpStatus.OK); + return new ResponseEntity("true",HttpStatus.OK); } @ApiOperation(value = "消除未读单个", notes = "消除未读单个") @@ -157,7 +156,7 @@ public class OcrMsgReadController { boolean save = ocrMsgReadService.save(ocrmsgread); //此处需要手工处理 返回需要将修改后的数据返回 - return new ResponseEntity(save,HttpStatus.CREATED); + return new ResponseEntity(save,HttpStatus.OK); } } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSUserTController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSUserTController.java index 2ec1928e..3256093a 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSUserTController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSUserTController.java @@ -9,8 +9,11 @@ import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil; import cn.jyjz.xiaoyao.common.redis.cache.ICacheManager; import cn.jyjz.xiaoyao.common.redis.cache.constants.CacheConstants; import cn.jyjz.xiaoyao.framework.security.service.SmsLoginService; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrMsg; import cn.jyjz.xiaoyao.ocr.dataobject.OcrSUserT; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture; import cn.jyjz.xiaoyao.ocr.service.OcrISUserTService; +import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import io.swagger.annotations.ApiOperation; @@ -54,6 +57,9 @@ public class OcrSUserTController { @Resource ICacheManager iCacheManager; + @Autowired + OcrTaskchildPictureService ocrtaskchildpictureservice; + /** 忘记密码 */ @ApiOperation(value = "重置密码", notes = "重置密码") @@ -100,7 +106,7 @@ public class OcrSUserTController { } @ApiOperation(value = "忘记密码", notes = "忘记密码") - @RequestMapping(value = "/selectSUser", method = RequestMethod.GET) + @RequestMapping(value = "/selectSUser", method = RequestMethod.POST) public ResponseEntity selectSUser(@RequestBody Map map) { if(null!=map.get("loginname")){ @@ -161,4 +167,5 @@ public class OcrSUserTController { } + } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSearchHistoryController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSearchHistoryController.java new file mode 100644 index 00000000..cd49eb19 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSearchHistoryController.java @@ -0,0 +1,94 @@ +package cn.jyjz.xiaoyao.ocr.controller; + +import cn.jyjz.xiaoyao.common.base.service.UserTokenService; +import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil; +import cn.jyjz.xiaoyao.common.base.vo.UserToken; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrMsgRead; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrSearchHistory; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestParam; +import javax.servlet.http.HttpServletRequest; +import cn.jyjz.xiaoyao.ocr.service.IOcrSearchHistoryService; + +import java.util.List; + +/** + * ocr控制器 + * + * @author 你的肉 + * @Date 2024-03-15 19:53:30 + */ +@CrossOrigin +@RestController +@RequestMapping("/ocr/history") +public class OcrSearchHistoryController { + + + @Autowired + private IOcrSearchHistoryService ocrSearchHistoryService; + + @Autowired + private UserTokenService userTokenService; + + /** + * 搜索查询 + * @param request + * @return + */ + @RequestMapping(value = "/searchList", method = RequestMethod.GET) + public ResponseEntity searchList(HttpServletRequest request, + @RequestParam(value = "search", required = false) String search) { + UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); + //执行查询方法 + List selectsearch = ocrSearchHistoryService.selectsearch(search, userToken.getUsername()); + + OcrSearchHistory ocrsearchhistory =new OcrSearchHistory(); + ocrsearchhistory.setHistoryname(search); + ocrsearchhistory.setUserid(Long.valueOf(userToken.getUserid())); + ocrsearchhistory.setCreatedate(System.currentTimeMillis()); + ocrSearchHistoryService.save(ocrsearchhistory); + + return new ResponseEntity(selectsearch, HttpStatus.OK); + } + + + /** + * 通过 删除历史记录 + * @param request + * @return + */ + @RequestMapping(value = "/searchdelete", method = RequestMethod.DELETE) + public ResponseEntity searchdelete(HttpServletRequest request) { + UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("userid",userToken.getUserid()); + //根据具体情况 判断 是否需要 进行数据返回， 默认不返回数据 + ocrSearchHistoryService.remove(wrapper); + return new ResponseEntity("true",HttpStatus.OK); + } + + /** + * 历史搜索 + * + * @param request + * @return + */ + @RequestMapping(value = "/historySearch", method = RequestMethod.GET) + public ResponseEntity historySearch(HttpServletRequest request) { + UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.select("historyname","createdate").eq("userid",userToken.getUserid()).orderByDesc("createdate").last("limit 8"); + List list = ocrSearchHistoryService.list(wrapper); + + return new ResponseEntity>(list, HttpStatus.OK); + } + +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrMsgMapper.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrMsgMapper.java index eeea9161..5f4cce4b 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrMsgMapper.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrMsgMapper.java @@ -4,6 +4,10 @@ package cn.jyjz.xiaoyao.ocr.dataDao; import cn.jyjz.xiaoyao.ocr.dataobject.OcrMsg; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; /** *

@@ -15,5 +19,5 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface OcrMsgMapper extends BaseMapper { - + List>> selectPage(@Param("userid")String userid,@Param("msgCategory")String msgCategory); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java new file mode 100644 index 00000000..ce145ec7 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java @@ -0,0 +1,23 @@ +package cn.jyjz.xiaoyao.ocr.dataDao; + + +import cn.jyjz.xiaoyao.ocr.dataobject.OcrSearchHistory; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import liquibase.pro.packaged.S; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 综合搜索历史表 Mapper 接口 + *

+ * + * @author 你的肉123 + * @since 2024-03-15 + */ +@Mapper +public interface OcrSearchHistoryMapper extends BaseMapper { + List selectsearch(@Param("search")String search,@Param("assignee") String assignee); +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrSearchHistory.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrSearchHistory.java new file mode 100644 index 00000000..03c2f373 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrSearchHistory.java @@ -0,0 +1,90 @@ +package cn.jyjz.xiaoyao.ocr.dataobject; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; + +import java.io.Serializable; + +/** + *

+ * 综合搜索历史表 + *

+ * + * @author 你的肉123 + * @since 2024-03-15 + */ +@TableName("ocr_search_history") +public class OcrSearchHistory extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 历史主键 + */ + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + /** + * 搜索历史名称 + */ + private String historyname; + + public Long getUserid() { + return userid; + } + + public void setUserid(Long userid) { + this.userid = userid; + } + + /** + * 创建时间 + */ + private Long userid; + /** + * 创建时间 + */ + private Long createdate; + + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + + public String getHistoryname() { + return historyname; + } + + public void setHistoryname(String historyname) { + this.historyname = historyname; + } + + public Long getCreatedate() { + return createdate; + } + + public void setCreatedate(Long createdate) { + this.createdate = createdate; + } + + @Override + public Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "OcrSearchHistory{" + + "id=" + id + + ", historyname=" + historyname + + ", userid=" + userid + + ", createdate=" + createdate + + "}"; + } +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrMsgService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrMsgService.java index e82d72ce..b0904260 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrMsgService.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrMsgService.java @@ -3,6 +3,11 @@ package cn.jyjz.xiaoyao.ocr.service; import cn.jyjz.xiaoyao.ocr.dataobject.OcrMsg; import com.baomidou.mybatisplus.extension.service.IService; +import com.github.pagehelper.PageInfo; +import cn.jyjz.xiaoyao.ocr.util.PageRequest; + +import java.util.List; +import java.util.Map; /** *

@@ -14,4 +19,13 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IOcrMsgService extends IService { + /** + * 分页查询接口 + * 这里统一封装了分页请求和结果，避免直接引入具体框架的分页对象, 如MyBatis或JPA的分页对象 + * 从而避免因为替换ORM框架而导致服务层、控制层的分页接口也需要变动的情况，替换ORM框架也不会 + * 影响服务层以上的分页接口，起到了解耦的作用 + * @param pageRequest 自定义，统一分页查询请求 + * @return PageResult 自定义，统一分页查询结果 + */ + PageInfo>> selectPage(PageRequest pageRequest,String userid, String msgCategory); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java new file mode 100644 index 00000000..57ccaf32 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java @@ -0,0 +1,20 @@ +package cn.jyjz.xiaoyao.ocr.service; + + +import cn.jyjz.xiaoyao.ocr.dataobject.OcrSearchHistory; +import com.baomidou.mybatisplus.extension.service.IService; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 综合搜索历史表 服务类 + *

+ * + * @author 你的肉123 + * @since 2024-03-15 + */ +public interface IOcrSearchHistoryService extends IService { + List selectsearch(String search,String assignee); +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrMsgServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrMsgServiceImpl.java index 68286ecf..626b7e5a 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrMsgServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrMsgServiceImpl.java @@ -4,8 +4,16 @@ import cn.jyjz.xiaoyao.ocr.dataDao.OcrMsgMapper; import cn.jyjz.xiaoyao.ocr.dataobject.OcrMsg; import cn.jyjz.xiaoyao.ocr.service.IOcrMsgService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.jyjz.xiaoyao.ocr.util.PageRequest; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + /** *

* 服务实现类 @@ -17,4 +25,17 @@ import org.springframework.stereotype.Service; @Service public class OcrMsgServiceImpl extends ServiceImpl implements IOcrMsgService { + @Resource + OcrMsgMapper ocrmsgmapper; + + + @Override + public PageInfo>> selectPage(PageRequest pageRequest,String userid, String msgCategory) { + int pageNum = pageRequest.getPageNum(); + int pageSize = pageRequest.getPageSize(); + PageHelper.startPage(pageNum, pageSize); + List>> selectPage = ocrmsgmapper.selectPage(userid,msgCategory); + return new PageInfo>>(selectPage); + } + } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java new file mode 100644 index 00000000..82ee3c39 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java @@ -0,0 +1,31 @@ +package cn.jyjz.xiaoyao.ocr.service.impl; + +import cn.jyjz.xiaoyao.ocr.dataobject.OcrSearchHistory; +import cn.jyjz.xiaoyao.ocr.service.IOcrSearchHistoryService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import cn.jyjz.xiaoyao.ocr.dataDao.OcrSearchHistoryMapper; + +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; + +/** + *

+ * 综合搜索历史表 服务实现类 + *

+ * + * @author 你的肉123 + * @since 2024-03-15 + */ +@Service +public class OcrSearchHistoryServiceImpl extends ServiceImpl implements IOcrSearchHistoryService { + + @Resource + OcrSearchHistoryMapper ocrsearchhistorymapper; + + @Override + public List selectsearch(String search, String assignee) { + return ocrsearchhistorymapper.selectsearch(search,assignee); + } +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/PageRequest.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/PageRequest.java new file mode 100644 index 00000000..ff42ebf8 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/PageRequest.java @@ -0,0 +1,27 @@ +package cn.jyjz.xiaoyao.ocr.util; +/** + * 分页请求 + */ +public class PageRequest { + /** + * 当前页码 + */ + private int pageNum; + /** + * 每页数量 + */ + private int pageSize; + + public int getPageNum() { + return pageNum; + } + public void setPageNum(int pageNum) { + this.pageNum = pageNum; + } + public int getPageSize() { + return pageSize; + } + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } +} \ No newline at end of file diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrMsgMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrMsgMapper.xml index 4b7dacce..b89f8873 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrMsgMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrMsgMapper.xml @@ -28,4 +28,69 @@ id, titile, msg_content AS msgContent, sender, msg_category AS msgCategory, receive_user_type AS receiveUserType, bus_json AS busJson, create_time AS createTime, create_by AS createBy, update_time AS updateTime, update_by AS updateBy, receive_user_ids AS receiveUserIds, open_type AS openType, open_page AS openPage, send_status AS sendStatus, send_time AS sendTime, cancel_time AS cancelTime + + diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml new file mode 100644 index 00000000..8f5925d3 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + id, historyname, userid, createdate + + + + + + From 10d1a0386137c888a87d1a4ef0ab4648abe98fd4 Mon Sep 17 00:00:00 2001 From: DELL Date: Sat, 16 Mar 2024 09:24:12 +0800 Subject: [PATCH 05/23] save --- .idea/compiler.xml | 8 +- .idea/encodings.xml | 14 - .idea/jarRepositories.xml | 5 + develop/logs/ocr/log_error.log | 8463 +++++++++++++++ develop/logs/ocr/log_info.log | 9564 +++++++++++++++++ .../src/main/resources/application-dev.yml | 18 +- runstart/src/main/resources/application.yml | 2 +- 7 files changed, 18046 insertions(+), 28 deletions(-) create mode 100644 develop/logs/ocr/log_error.log create mode 100644 develop/logs/ocr/log_info.log diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 41c17930..5a9d7818 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -31,18 +31,18 @@