guoxiangbin
/
ocr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

动态列

Browse Source
pull/1/head
DELL 1 year ago
parent 97a87fdec9
commit 43273a4cb3
18 changed files with 785 additions and 557 deletions
Show Stats Download Patch File Download Diff File

8
jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/JwtAuthenticationFilter.java
Unescape View File

@ -58,17 +58,21 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
String[] excludespath = systemopenurlService.getOpenUrl(); String[] excludespath = systemopenurlService.getOpenUrl();
//不需要过滤的url //不需要过滤的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); String[] urls = ArrayUtils.addAll(excludespath, excludesOther);
boolean flag = true; boolean flag = true;
if("/".equalsIgnoreCase(spath)) {
flag = false;
}else{
for (String str : urls) { for (String str : urls) {
if (spath.indexOf(str) != -1) { if (spath.indexOf(str) != -1) {
flag =false; flag = false;
break; break;
} }
} }
}
if(flag){ if(flag){
//获取登录凭证 //获取登录凭证
String logintoken = RequestBaseUtil.getToken(request); String logintoken = RequestBaseUtil.getToken(request);

144
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrFieldController.java
Unescape View File

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

87
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUserFieldController.java
Unescape View File

@ -1,15 +1,72 @@
//package cn.jyjz.xiaoyao.ocr.controller; package cn.jyjz.xiaoyao.ocr.controller;
//
//import cn.jyjz.xiaoyao.common.base.controller.BaseController; import cn.jyjz.xiaoyao.common.base.controller.BaseController;
//import org.slf4j.Logger; import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
//import org.slf4j.LoggerFactory; import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
//import org.springframework.web.bind.annotation.RequestMapping; import cn.jyjz.xiaoyao.ocr.dataobject.OcrField;
//import org.springframework.web.bind.annotation.RestController; import cn.jyjz.xiaoyao.ocr.dataobject.OcrUserField;
// import cn.jyjz.xiaoyao.ocr.dto.OcrFieldDto;
//@RestController import cn.jyjz.xiaoyao.ocr.dto.OcrUserFieldDto;
//@RequestMapping("/ocr/user/field") import cn.jyjz.xiaoyao.ocr.service.OcrFieldService;
//public class OcrUserFieldController extends BaseController{ import cn.jyjz.xiaoyao.ocr.service.OcrUserFieldService;
// import cn.jyjz.xiaoyao.ocr.vo.OcrFieldVo;
// private Logger log = LoggerFactory.getLogger(this.getClass()); 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<OcrUserFieldDto> queryFields(@RequestParam(name="userId") Long userId ,@RequestParam(name="reviewType") Integer reviewType) {
ResultVo<OcrUserFieldDto> resultVo = new ResultVo<>();
OcrUserFieldDto ocrUserFieldDto = ocrUserFieldService.queryFields(userId,reviewType);
resultVo.setData(ocrUserFieldDto);
resultVo.addOK("查询成功");
return resultVo;
}
}

26
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrFieldMybatisDao.java
Unescape View File

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

26
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrUserFieldMybatisDao.java
Unescape View File

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

133
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrField.java
Unescape View File

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

137
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrUserField.java
Unescape View File

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

82
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dto/OcrFieldDto.java
Unescape View File

@ -1,47 +1,35 @@
//package cn.jyjz.xiaoyao.ocr.dto; package cn.jyjz.xiaoyao.ocr.dto;
//
//import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
//import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
//import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
//import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
//import lombok.Builder; import lombok.Builder;
//import lombok.Data; import lombok.Data;
//import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
//
//import java.io.Serializable; import java.io.Serializable;
// import java.sql.Date;
//@Data
//@Builder @Data
//@NoArgsConstructor @Builder
//@AllArgsConstructor @NoArgsConstructor
//@Schema(name = "字段信息", title = "字段信息") @AllArgsConstructor
//public class OcrFieldDto implements Serializable { @Schema(name = "字段信息", title = "字段信息")
// private static final long serialVersionUID = 8088861709460050761L; public class OcrFieldDto implements Serializable {
// @Schema(description = "主键") private static final long serialVersionUID = 8088861709460050761L;
// private Long id; @Schema(description = "主键")
// private Long id;
// @Schema(description = "字段名称")
// private String name; @Schema(description = "字段名称")
// private String name;
// @Schema(description = "字段类型（一审：1，二审：2，终审：0）")
// private Integer reviewType; @Schema(description = "字段类型（终审:0，工单：1、一审二审:2、审核填报:3）")
// private Integer reviewType;
// @Schema(description = "字段描述")
// private String fieldDesc; @Schema(description = "字段描述")
// private String fieldDesc;
// @Schema(description = "创建人")
// private String createBy; @Schema(description = "是否删除，0：未删除，1:已删除")
// private Integer del;
// @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;
//}

85
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dto/OcrUserFieldDto.java
Unescape View File

@ -1,51 +1,34 @@
//package cn.jyjz.xiaoyao.ocr.dto; package cn.jyjz.xiaoyao.ocr.dto;
//
//import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
//import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
//import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
//import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
//import lombok.Builder; import lombok.Builder;
//import lombok.Data; import lombok.Data;
//import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
//
//import java.io.Serializable; import java.io.Serializable;
// import java.sql.Date;
//@Data
//@Builder @Data
//@NoArgsConstructor @Builder
//@AllArgsConstructor @NoArgsConstructor
//@Schema(name = "用户-展示字段", title = "用户-展示字段") @AllArgsConstructor
//@TableName(value = "ocr_user_field") @Schema(name = "用户-展示字段", title = "用户-展示字段")
//public class OcrUserFieldDto implements Serializable { public class OcrUserFieldDto implements Serializable {
// private static final long serialVersionUID = 8088861709460050761L; private static final long serialVersionUID = 8088861709460050761L;
// @Schema(description = "主键") @Schema(description = "主键")
// private Long id; private Long id;
//
// @Schema(description = "用户ID") @Schema(description = "用户ID")
// private long userId; private long userId;
//
// @Schema(description = "评审类型（一审：1，二审：2，终审：0）") @Schema(description = "评审类型（终审:0，工单：1、一审二审:2、审核填报:3）")
// private Integer reviewType; private Integer reviewType;
//
// @Schema(description = "展示字段字符串") @Schema(description = "展示字段字符串")
// private String userField; 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;
//}
//
//

51
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrFieldService.java
Unescape View File

@ -1,18 +1,33 @@
//package cn.jyjz.xiaoyao.ocr.service; package cn.jyjz.xiaoyao.ocr.service;
//
//import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService; import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService;
//import cn.jyjz.xiaoyao.ocr.dataobject.OcrField; import cn.jyjz.xiaoyao.ocr.dataobject.OcrField;
//import cn.jyjz.xiaoyao.ocr.dto.OcrFieldDto; import cn.jyjz.xiaoyao.ocr.dto.OcrFieldDto;
// import cn.jyjz.xiaoyao.ocr.vo.OcrFieldVo;
//import java.util.List;
// import java.util.List;
///**
//* 业务层 /**
//*/ * 业务层
//public interface OcrFieldService extends BaseService<OcrField> { */
// public interface OcrFieldService extends BaseService<OcrField> {
// /**
// * 自定义筛选字段列表查询 /**
// */ * 自定义筛选字段列表查询
// List<OcrFieldDto> list(Integer reviewType); */
//} List<OcrFieldDto> list(Integer reviewType);
/**
* 自定义筛选字段列表查询全部
*/
List<OcrFieldDto> listAll();
/**
* 删除自定义筛选字段
*/
OcrFieldDto delete(Long id);
/**
* 自定义筛选字段新增和修改
*/
void saveData(OcrField ocrField);
}

35
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrUserFieldService.java
Unescape View File

@ -1,11 +1,24 @@
//package cn.jyjz.xiaoyao.ocr.service; package cn.jyjz.xiaoyao.ocr.service;
//
//import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService; import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService;
//import cn.jyjz.xiaoyao.ocr.dataobject.OcrUserField; import cn.jyjz.xiaoyao.ocr.dataobject.OcrField;
// import cn.jyjz.xiaoyao.ocr.dataobject.OcrUserField;
///** import cn.jyjz.xiaoyao.ocr.dto.OcrUserFieldDto;
//* 业务层
//*/ import java.util.List;
//public interface OcrUserFieldService extends BaseService<OcrUserField> {
// /**
//} * 业务层
*/
public interface OcrUserFieldService extends BaseService<OcrUserField> {
/**
* 自定义筛选字段新增和修改
*/
void saveData(OcrUserField ocrUserField);
/**
* 用户-筛选字段查询
*/
OcrUserFieldDto queryFields(Long userId,Integer reviewType);
}

164
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrFieldServiceImpl.java
Unescape View File

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

95
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUserFieldServiceImpl.java
Unescape View File

@ -1,21 +1,74 @@
//package cn.jyjz.xiaoyao.ocr.service.impl; package cn.jyjz.xiaoyao.ocr.service.impl;
//
//import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl; import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl;
//import cn.jyjz.xiaoyao.ocr.dataDao.OcrUserFieldMybatisDao; import cn.jyjz.xiaoyao.ocr.dataDao.OcrUserFieldMybatisDao;
//import cn.jyjz.xiaoyao.ocr.dataobject.OcrUserField; import cn.jyjz.xiaoyao.ocr.dataobject.OcrField;
//import cn.jyjz.xiaoyao.ocr.service.OcrUserFieldService; import cn.jyjz.xiaoyao.ocr.dataobject.OcrUserField;
//import lombok.extern.slf4j.Slf4j; import cn.jyjz.xiaoyao.ocr.dto.OcrUserFieldDto;
//import org.springframework.beans.factory.annotation.Autowired; import cn.jyjz.xiaoyao.ocr.service.OcrUserFieldService;
//import org.springframework.stereotype.Service; 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;
//@Service
//@Slf4j import java.sql.Date;
//public class OcrUserFieldServiceImpl extends BaseServiceImpl<OcrUserFieldMybatisDao, OcrUserField> implements OcrUserFieldService { import java.sql.Timestamp;
// @Autowired import java.util.List;
// private OcrUserFieldMybatisDao ocrUserFieldMybatisDao;
//
//} /**
* 业务层实现
*/
@Service
@Slf4j
public class OcrUserFieldServiceImpl extends BaseServiceImpl<OcrUserFieldMybatisDao, OcrUserField> implements OcrUserFieldService {
@Autowired
private OcrUserFieldMybatisDao ocrUserFieldMybatisDao;
@Override
public void saveData(OcrUserField ocrUserField){
try {
LambdaQueryWrapper<OcrUserField> 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<OcrUserField> 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;
}
}

93
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrFieldVo.java
Unescape View File

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

102
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrUserFieldVo.java
Unescape View File

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

30
jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrFieldMapper.xml
Unescape View File

@ -1,15 +1,15 @@
<!--<?xml version="1.0" encoding="UTF-8" ?>--> <?xml version="1.0" encoding="UTF-8" ?>
<!--<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">--> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!--<mapper namespace="cn.jyjz.xiaoyao.ocr.dataDao.OcrFieldMybatisDao">--> <mapper namespace="cn.jyjz.xiaoyao.ocr.dataDao.OcrFieldMybatisDao">
<!-- <resultMap id="BaseResultMap" type="cn.jyjz.xiaoyao.ocr.dataobject.OcrField">--> <resultMap id="BaseResultMap" type="cn.jyjz.xiaoyao.ocr.dataobject.OcrField">
<!-- <id column="id" property="id" jdbcType="BIGINT"/>--> <id column="id" property="id" jdbcType="BIGINT"/>
<!-- <result column="name" property="name" jdbcType="VARCHAR"/>--> <result column="name" property="name" jdbcType="VARCHAR"/>
<!-- <result column="review_type" property="reviewType" jdbcType="INTEGER"/>--> <result column="review_type" property="reviewType" jdbcType="INTEGER"/>
<!-- <result column="field_desc" property="fieldDesc" jdbcType="VARCHAR"/>--> <result column="field_desc" property="fieldDesc" jdbcType="VARCHAR"/>
<!-- <result column="create_by" property="createBy" jdbcType="VARCHAR"/>--> <result column="create_by" property="createBy" jdbcType="VARCHAR"/>
<!-- <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>--> <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
<!-- <result column="update_by" property="updateBy" jdbcType="VARCHAR"/>--> <result column="update_by" property="updateBy" jdbcType="VARCHAR"/>
<!-- <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>--> <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
<!-- <result column="del" property="del" jdbcType="INTEGER"/>--> <result column="del" property="del" jdbcType="INTEGER"/>
<!-- </resultMap>--> </resultMap>
<!--</mapper>--> </mapper>

30
jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrUserFieldMapper.xml
Unescape View File

@ -1,15 +1,15 @@
<!--<?xml version="1.0" encoding="UTF-8" ?>--> <?xml version="1.0" encoding="UTF-8" ?>
<!--<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">--> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!--<mapper namespace="cn.jyjz.xiaoyao.ocr.dataDao.OcrUserFieldMybatisDao">--> <mapper namespace="cn.jyjz.xiaoyao.ocr.dataDao.OcrUserFieldMybatisDao">
<!-- <resultMap id="BaseResultMap" type="cn.jyjz.xiaoyao.ocr.dataobject.OcrUserField">--> <resultMap id="BaseResultMap" type="cn.jyjz.xiaoyao.ocr.dataobject.OcrUserField">
<!-- <id column="id" property="id" jdbcType="BIGINT"/>--> <id column="id" property="id"/>
<!-- <result column="user_id" property="userId" jdbcType="BIGINT"/>--> <result column="user_id" property="userId" />
<!-- <result column="review_type" property="reviewType" jdbcType="INTEGER"/>--> <result column="review_type" property="reviewType"/>
<!-- <result column="user_field" property="userField" jdbcType="VARCHAR"/>--> <result column="user_field" property="userField"/>
<!-- <result column="create_by" property="createBy" jdbcType="VARCHAR"/>--> <result column="create_by" property="createBy" />
<!-- <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>--> <result column="create_time" property="createTime"/>
<!-- <result column="update_by" property="updateBy" jdbcType="VARCHAR"/>--> <result column="update_by" property="updateBy"/>
<!-- <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>--> <result column="update_time" property="updateTime"/>
<!-- <result column="del" property="del" jdbcType="INTEGER"/>--> <result column="del" property="del"/>
<!-- </resultMap>--> </resultMap>
<!--</mapper>--> </mapper>

8
runstart/src/main/resources/application-dev.yml
Unescape View File

@ -29,10 +29,10 @@ spring:
password: ysltest2024. password: ysltest2024.
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
slave: 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 driver-class-name: com.mysql.cj.jdbc.Driver
username: jyjz username: ysltest
password: jyjz password: ysltest2024.
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
druid: druid:
# 初始连接数 # 初始连接数
@ -104,7 +104,7 @@ flowable:
deployment-api-url: http://127.0.0.1:9090/foodapi/flowable-task/app-api deployment-api-url: http://127.0.0.1:9090/foodapi/flowable-task/app-api
#关闭定时任务JOB #关闭定时任务JOB
async-executor-activate: false async-executor-activate: false
database-schema-update: true database-schema-update: false
# #
# cache: # cache:
# type: redis # type: redis

Write Preview
Loading…
Cancel
Save