From 4038b03337e375259069cb2cb33fd125f56e0bb6 Mon Sep 17 00:00:00 2001 From: sunchenliang <2532527871@qq.com> Date: Sun, 24 Mar 2024 14:55:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E8=BF=94=E5=9B=9E=E5=9B=BE=E7=89=87=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jyjz/xiaoyao/ocr/dataobject/OcrPicture.java | 6 ++++++ .../ocr/dataobject/OcrTaskchildPicture.java | 7 +++++++ .../impl/OcrTaskchildPictureServiceImpl.java | 15 +++++++++++---- .../ocr/thread/tasks/PictureDisposeTask.java | 2 ++ 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java index 94dabec5..72561a70 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java @@ -348,6 +348,12 @@ public class OcrPicture implements BaseDto, java.io.Serializable { @TableField(value = "suspiciousfile") private Integer suspiciousfile; + @ApiModelProperty(value = "定位") + @Schema(description = "定位") + @TableField(value = "location") + private String location; + + //图片分类 @TableField(exist = false) private OcrPictureclass ocrPictureclass; diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java index 26bc399a..9395fff9 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java @@ -261,11 +261,18 @@ public class OcrTaskchildPicture implements BaseDto, java.io.Serializable { @TableField(exist = false) private List userapproveList; + @ApiModelProperty(value = "定位") + @TableField(exist = false) + private String location; + //保存当前登录用户的数据权限范围的搜索条件 @TableField(exist = false) @JsonIgnore private SearchQuery searchQueryrolesShowleave; + @TableField(exist = false) + private OcrPictureInfo pictureInfo; + public FlowModelVO getFlowModelVO() { FlowModelVO flowModelVO = new FlowModelVO(); flowModelVO.setFormid(this.getId()); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java index 0cae866a..063ddc3a 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java @@ -14,9 +14,11 @@ import cn.jyjz.xiaoyao.oa.from.dataobject.Userapprove; import cn.jyjz.xiaoyao.oa.from.service.UserapproveService; import cn.jyjz.xiaoyao.ocr.dataDao.OcrTaskchildPictureMybatisDao; import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureInfo; import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture; import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPictureAppro; import cn.jyjz.xiaoyao.ocr.dto.UserapproveDto; +import cn.jyjz.xiaoyao.ocr.service.OcrPictureInfoService; import cn.jyjz.xiaoyao.ocr.service.OcrPictureService; import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService; import com.alibaba.fastjson.JSON; @@ -57,6 +59,9 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl().eq(OcrPictureInfo::getPictureId, ocrTaskchildPicture.getPictureid())); + ocrTaskchildPicture.setPictureInfo(one); + ocrTaskchildPicture.setLocation(ocrPicture.getLocation()); + // String pictureids = ocrTaskchildPicture.getPicturecompare(); // String[] splitPictureids = pictureids.split(","); // List listPictureids = Arrays.asList(splitPictureids); // //设置是否为历史信息 @@ -436,8 +443,8 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl().eq(Userapprove::getFormid,ocrTaskchildPicture.getId()).orderByDesc(Userapprove::getCreatedate)); - if(ObjectUtil.isNotEmpty(one)){ + Userapprove one = userapproveService.getOne(new LambdaQueryWrapper().eq(Userapprove::getFormid, ocrTaskchildPicture.getId()).orderByDesc(Userapprove::getCreatedate).last("limit 1")); + if (ObjectUtil.isNotEmpty(one)) { ocrTaskchildPicture.setHistoryStates(one.getStatshis()); } OcrPicture ocrPicture = this.ocrPictureService.selectDtoById(ocrTaskchildPicture.getPictureid()); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java index 5b1dec8a..3c6357fa 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java @@ -6,6 +6,7 @@ import cn.jyjz.xiaoyao.common.base.util.StringUtils; import cn.jyjz.xiaoyao.ocr.api.entity.PictureSourceResult; import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture; import cn.jyjz.xiaoyao.ocr.service.OcrPictureService; +import com.alibaba.fastjson.JSONObject; import javafx.scene.input.DataFormat; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,6 +47,7 @@ public class PictureDisposeTask implements Runnable{ if(map.get("imgUrl")!=null && !StringUtils.isEmpty(map.get("imgUrl").toString())){ //不为空开始组装参数 入库 OcrPicture picture = new OcrPicture(); + picture.setLocation(JSONObject.toJSONString(pictureSourceResult.getLocation())); //租户编号 picture.setTenantId(pictureSourceResult.getTenantNo()); //租户名称