修改任务详情返回图片信息

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;

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<UserapproveDto> 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());

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<OcrTaskchild
     @Resource
     private UserapproveService userapproveService;
 
+    @Resource
+    private OcrPictureInfoService pictureInfoService;
+
     /**
      * 图片真假设置
      *
@@ -317,8 +322,10 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
         }
         //查询图片对象
         OcrPicture ocrPicture = this.ocrPictureService.selectDtoById(ocrTaskchildPicture.getPictureid());
-
-//		String pictureids = ocrTaskchildPicture.getPicturecompare();
+        OcrPictureInfo one = pictureInfoService.getOne(new LambdaQueryWrapper<OcrPictureInfo>().eq(OcrPictureInfo::getPictureId, ocrTaskchildPicture.getPictureid()));
+        ocrTaskchildPicture.setPictureInfo(one);
+        ocrTaskchildPicture.setLocation(ocrPicture.getLocation());
+        //		String pictureids = ocrTaskchildPicture.getPicturecompare();
 //		String[] splitPictureids = pictureids.split(",");
 //		List<String> listPictureids = Arrays.asList(splitPictureids);
 //		//设置是否为历史信息
@@ -436,8 +443,8 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
             } else {
                 ocrTaskchildPicture.setIzHistory(true);
             }
-            Userapprove one = userapproveService.getOne(new LambdaQueryWrapper<Userapprove>().eq(Userapprove::getFormid,ocrTaskchildPicture.getId()).orderByDesc(Userapprove::getCreatedate));
-            if(ObjectUtil.isNotEmpty(one)){
+            Userapprove one = userapproveService.getOne(new LambdaQueryWrapper<Userapprove>().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());

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());
                 //租户名称