Merge pull request 'feat：重置流程删除查重记录及图片查重结果' (#160) from feat/updatePrevailCloudLog into test

Reviewed-on: #160

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java

@@ -17,17 +17,8 @@ import cn.jyjz.xiaoyao.oa.from.service.UserapproveService;
 import cn.jyjz.xiaoyao.oa.from.service.impl.UserapproveServiceImpl;
 import cn.jyjz.xiaoyao.ocr.api.utils.ApiConfig;
 import cn.jyjz.xiaoyao.ocr.dataDao.OcrPictureMybatisDao;
-import cn.jyjz.xiaoyao.ocr.dataobject.OcrPackagetask;
+import cn.jyjz.xiaoyao.ocr.dataobject.*;
-import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture;
+import cn.jyjz.xiaoyao.ocr.service.*;
-import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureInfo;
-import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
-import cn.jyjz.xiaoyao.ocr.dataobject.OcrUsersearch;
-import cn.jyjz.xiaoyao.ocr.dataobject.OcrUsersearchchild;
-import cn.jyjz.xiaoyao.ocr.service.OcrPackagetaskService;
-import cn.jyjz.xiaoyao.ocr.service.OcrPictureInfoService;
-import cn.jyjz.xiaoyao.ocr.service.OcrPictureService;
-import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService;
-import cn.jyjz.xiaoyao.ocr.service.OcrUsersearchService;
 import cn.jyjz.xiaoyao.ocr.thread.TaskQueue;
 import cn.jyjz.xiaoyao.ocr.thread.entity.PictureImgToLocalEntity;
 import cn.jyjz.xiaoyao.ocr.util.DataDictionaryUtil;
@@ -35,6 +26,7 @@ import cn.jyjz.xiaoyao.ocr.util.HashCompareUtil;
 import cn.jyjz.xiaoyao.ocr.util.ImageClassUtil;
 import cn.jyjz.xiaoyao.ocr.util.SearchEnum;
 import cn.jyjz.xiaoyao.ocr.util.SearchParaFormatting;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -58,11 +50,7 @@ import java.io.File;
 import java.math.BigDecimal;
 import java.net.URL;
 import java.net.URLConnection;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -96,6 +84,14 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
     private CategoryService categoryService;
     @Resource
     private OcrPictureInfoService ocrPictureInfoService;
+    @Resource
+    private OcrCheckDescribeHisService ocrCheckDescribeHisService;
+
+    @Resource
+    private IOcrCheckDuplicateResultService ocrCheckDuplicateResultService;
+
+    @Resource
+    private IOcrPictureDuplicateHisService ocrPictureDuplicateHisService;
     private Object lock = new Object();
     /**
      * 字典数据添加工具类
@@ -415,7 +411,6 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
 //    }
 
 
-
     public OcrTaskchildPicture updateTaskChild(OcrPicture ocrPicture, Long packageid, String buessinessno) {
         OcrTaskchildPicture ocrTaskchildPicture = ocrTaskchildPictureService.getOne(new LambdaQueryWrapper<OcrTaskchildPicture>().eq(OcrTaskchildPicture::getPictureid, ocrPicture.getId()));
         ocrTaskchildPicture.setBuessinessno(buessinessno);
@@ -531,6 +526,57 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
         ocrTaskchildPictureService.remove(new LambdaQueryWrapper<OcrTaskchildPicture>().eq(OcrTaskchildPicture::getPictureid, id));
         //删除审批记录表
         userapproveService.delete(taskchildPicture.getId().toString());
+        //小结查重记录
+        OcrCheckDescribeHis checkDescribeHis = ocrCheckDescribeHisService.getOne(new LambdaQueryWrapper<OcrCheckDescribeHis>().eq(OcrCheckDescribeHis::getPictureId, id));
+        if (checkDescribeHis != null) {
+            String checkResult = checkDescribeHis.getCheckResult();
+            if (StringUtils.isNotBlank(checkResult)) {
+                String[] checkResultPictureIds = checkResult.split(",");
+                List<OcrCheckDescribeHis> checkDescribes = ocrCheckDescribeHisService.list(new LambdaQueryWrapper<OcrCheckDescribeHis>().in(OcrCheckDescribeHis::getPictureId, checkResultPictureIds));
+                for (OcrCheckDescribeHis checkDescribe : checkDescribes) {
+                    String[] split = checkDescribe.getCheckResult().split(",");
+                    List<String> list = Arrays.asList(split);
+                    list.remove(id.toString());
+                    checkDescribe.setCheckResult(String.join(",", list));
+                }
+                ocrCheckDescribeHisService.updateBatchById(checkDescribes);
+            }
+            ocrCheckDescribeHisService.remove(new LambdaQueryWrapper<OcrCheckDescribeHis>().eq(OcrCheckDescribeHis::getPictureId, id));
+        }
+        //图片对比记录
+        OcrPictureDuplicateHis hisServiceOne = ocrPictureDuplicateHisService.getOne(new LambdaQueryWrapper<OcrPictureDuplicateHis>().eq(OcrPictureDuplicateHis::getPictureId, id));
+        if (null != hisServiceOne) {
+            String checkDuplicateResultHisJson = hisServiceOne.getCheckDuplicateResultHisJson();
+            if (StringUtils.isNotBlank(checkDuplicateResultHisJson)) {
+                JSONObject jsonObject = JSON.parseObject(checkDuplicateResultHisJson);
+                Set<String> keyList = jsonObject.keySet();
+                List<OcrPictureDuplicateHis> list = ocrPictureDuplicateHisService.list(new LambdaQueryWrapper<OcrPictureDuplicateHis>().in(OcrPictureDuplicateHis::getPictureId, keyList));
+                for (OcrPictureDuplicateHis ocrPictureDuplicateHis : list) {
+                    String checkDuplicateResultHis = ocrPictureDuplicateHis.getCheckDuplicateResultHisJson();
+                    JSONObject json = JSON.parseObject(checkDuplicateResultHis);
+                    json.remove(id.toString());
+                    ocrPictureDuplicateHis.setCheckDuplicateResultHisJson(JSON.toJSONString(json));
+                }
+                ocrPictureDuplicateHisService.updateBatchById(list);
+            }
+            ocrPictureDuplicateHisService.remove(new LambdaQueryWrapper<OcrPictureDuplicateHis>().eq(OcrPictureDuplicateHis::getPictureId, id));
+        }
+        //查重结果
+        OcrCheckDuplicateResult duplicateResult = ocrCheckDuplicateResultService.getOne(new LambdaQueryWrapper<OcrCheckDuplicateResult>().eq(OcrCheckDuplicateResult::getPictureId, id));
+        String compareResultJson = duplicateResult.getCompareResultJson();
+        if (StringUtils.isNotBlank(compareResultJson)) {
+            JSONObject jsonObject = JSON.parseObject(compareResultJson);
+            Set<String> keyList = jsonObject.keySet();
+            List<OcrCheckDuplicateResult> list = ocrCheckDuplicateResultService.list(new LambdaQueryWrapper<OcrCheckDuplicateResult>().in(OcrCheckDuplicateResult::getPictureId, keyList));
+            for (OcrCheckDuplicateResult checkDuplicateResult : list) {
+                String resultCompareResultJson = checkDuplicateResult.getCompareResultJson();
+                JSONObject json = JSON.parseObject(resultCompareResultJson);
+                json.remove(id.toString());
+                checkDuplicateResult.setCompareResultJson(JSON.toJSONString(json));
+            }
+            ocrCheckDuplicateResultService.updateBatchById(list);
+        }
+        ocrCheckDuplicateResultService.remove(new LambdaQueryWrapper<OcrCheckDuplicateResult>().eq(OcrCheckDuplicateResult::getPictureId, id));
     }
 
     public void bubbleSortOpt(List<OcrPicture> compareList) {
@@ -758,6 +804,7 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
 
     /**
      * 新增图片信息表
+     *
      * @param ocrPicture
      */
     @Override
@@ -776,6 +823,7 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
 
     /**
      * 获取图片信息
+     *
      * @param imageUrl     图片地址 两种 网络或者本地图片
      * @param isConnection 是否是url 开启网络请求
      * @return
@@ -844,7 +892,6 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
     }
 
 
-
     private void convertImage(List<OcrPicture> list) {
         for (OcrPicture ocrPicture : list) {
             PictureImgToLocalEntity entity = new PictureImgToLocalEntity();

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml

@@ -259,10 +259,12 @@
 	</select>
 
 	<select id="getPictureApproveResult" resultType="java.lang.String">
-		SELECT
+        SELECT CONCAT('审批节点：', t1.TASKNAME, '，审批结果：', (CASE
-			CONCAT('审批节点：',t1.TASKNODE,'，审批结果：',t1.STATES,'，不通过原因：',t2.REASON)
+                                                                   WHEN t1.STATES = 5 THEN '审批不通过'
-		FROM
+                                                                   WHEN t1.STATES = 3 THEN '审批通过'
-			ocr_taskchild_picture t1
+                                                                   ELSE '审批中' END), '，不通过原因：', t2.REASON,
+                      '，备注：', t2.TASKCOMMENT)
+        FROM ocr_taskchild_picture t1
                  LEFT JOIN oa_userapprove_t t2 ON t1.ID = t2.FORMID
         where t1.PICTUREID = #{id,jdbcType=BIGINT}
     </select>