From f1a9dc2fb7db0c64c3a64c0ed65300257704dc07 Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Mon, 8 Apr 2024 10:33:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=A1=E6=89=B9=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=97=A0=E9=87=8F=E4=BA=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OcrTaskchildPictureServiceImpl.java  | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

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 ec251a5c..de58db7c 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
@@ -2,6 +2,7 @@ package cn.jyjz.xiaoyao.ocr.service.impl;
 
 import cn.hutool.core.map.MapBuilder;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.http.HttpUtil;
 import cn.jyjz.flowable.common.ProcessConstant;
 import cn.jyjz.flowable.common.SystemConstantsOa;
 import cn.jyjz.flowable.domain.vo.FlowModelVO;
@@ -22,6 +23,7 @@ import cn.jyjz.xiaoyao.ocr.dataDao.OcrTaskchildPictureMybatisDao;
 import cn.jyjz.xiaoyao.ocr.dataobject.*;
 import cn.jyjz.xiaoyao.ocr.dto.ApproveNodeDto;
 import cn.jyjz.xiaoyao.ocr.dto.FlowResultDto;
+import cn.jyjz.xiaoyao.ocr.dto.ResultDto;
 import cn.jyjz.xiaoyao.ocr.dto.UserapproveDto;
 import cn.jyjz.xiaoyao.ocr.service.IOcrPictureDuplicateHisService;
 import cn.jyjz.xiaoyao.ocr.service.OcrPictureInfoService;
@@ -29,6 +31,7 @@ import cn.jyjz.xiaoyao.ocr.service.OcrPictureService;
 import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService;
 import cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo;
 import cn.jyjz.xiaoyao.ocr.vo.PictureDetailVo;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -42,6 +45,8 @@ import org.flowable.bpmn.model.FlowElement;
 import org.flowable.bpmn.model.UserTask;
 import org.flowable.engine.history.HistoricProcessInstance;
 import org.flowable.task.api.Task;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpStatus;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.stereotype.Service;
 import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl;
@@ -60,6 +65,9 @@ import java.util.stream.Collectors;
 @Service("ocrTaskchildPictureService")
 @Slf4j
 public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchildPictureMybatisDao, OcrTaskchildPicture> implements OcrTaskchildPictureService {
+
+    @Value("${ocr.api.wly.data-url}")
+    private String dataUrl;
     @Resource
     private OcrTaskchildPictureMybatisDao ocrtaskchildpicturemybatisdao;
 
@@ -715,8 +723,8 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
         flowResultDto.setAccountNo(Long.parseLong(picture.getPictureid()));
         flowResultDto.setTaskNo(Long.parseLong(picture.getRemark()));
         flowResultDto.setPictureMatchDegree(BigDecimal.valueOf(picture.getSimilarityscore()));
-        flowResultDto.setIsPictureRepeat(Integer.valueOf(picture.getField14()));
-        flowResultDto.setIsPictureRight(picture.getIztrueorfalse());
+        flowResultDto.setIsPictureRepeat(picture.getField14()==null?0:Integer.valueOf(picture.getField14()));
+        flowResultDto.setIsPictureRight(picture.getIztrueorfalse()==null?0:picture.getIztrueorfalse());
         Integer resultStatus = Objects.equals(taskchildPicture.getStates(), SystemConstantsOa.OA_STATUS_TYPE_END) ? SystemConstantsOa.OCR_STATUS_SUCCESS : SystemConstantsOa.OCR_STATUS_FAILURE;
         flowResultDto.setApproveResult(resultStatus);
         flowResultDto.setApproveRemark(flowApprove.getComment());
@@ -729,9 +737,16 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
             }
         }
         flowResultDto.setApproveDetailList(nodeList);
-
+        ResultDto resultDto = new ResultDto();
+        resultDto.setStatus(HttpStatus.OK.value());
+        resultDto.setTimestamp(System.currentTimeMillis());
+        resultDto.setData(JSON.toJSONString(flowResultDto));
+        System.out.println(JSON.toJSONString(resultDto));
+        String post = HttpUtil.post(dataUrl, JSONObject.toJSONString(resultDto));
+        System.out.println(post);
     }
 
+
     @Override
     public List<OcrTaskChildPictureVo> getDubiousfileList(List<String> pictureIds, String taskname) {
         return ocrtaskchildpicturemybatisdao.getDubiousfileList(pictureIds, taskname);