修改一键查重添加创建任务方法

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

@@ -29,6 +29,15 @@ public interface OcrTaskchildPictureService extends BaseService<OcrTaskchildPict
      */
     public boolean markPoint(List<Long> taskids);
 
+    /**
+     *  创建任务
+     * @param ocrPictureList
+     * @param tenantId
+     * @param sysUser
+     */
+    public void createTask(List<OcrPicture> ocrPictureList, String tenantId,UserToken sysUser);
+
+
     /**
      * 查询智能识别
      * @param packageid 任务包主键

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

@@ -19,10 +19,7 @@ import cn.jyjz.xiaoyao.ocr.dataobject.OcrCheckDuplicate;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrCheckDuplicateResult;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureDuplicateHis;
-import cn.jyjz.xiaoyao.ocr.service.IOcrCheckDuplicateResultService;
+import cn.jyjz.xiaoyao.ocr.service.*;
-import cn.jyjz.xiaoyao.ocr.service.IOcrCheckDuplicateService;
-import cn.jyjz.xiaoyao.ocr.service.IOcrPictureDuplicateHisService;
-import cn.jyjz.xiaoyao.ocr.service.OcrPictureService;
 import cn.jyjz.xiaoyao.ocr.util.HashCompareUtil;
 import cn.jyjz.xiaoyao.ocr.util.ImageClassUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -33,6 +30,7 @@ import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.SneakyThrows;
 import lombok.extern.log4j.Log4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -71,11 +69,13 @@ public class OcrCheckDuplicateServiceImpl extends ServiceImpl<OcrCheckDuplicateM
     @Resource
     private LogService logService;
 
+    @Resource
+    private OcrTaskchildPictureService taskchildPictureService;
+
     @Value("${image.classifyPath}")
     private String classifyPath;
 
 
-
     /**
      * 查重任务接口
      */
@@ -126,7 +126,6 @@ public class OcrCheckDuplicateServiceImpl extends ServiceImpl<OcrCheckDuplicateM
     }
 
 
-
     /**
      * 获取当前查重任务执行状态
      */
@@ -250,7 +249,12 @@ public class OcrCheckDuplicateServiceImpl extends ServiceImpl<OcrCheckDuplicateM
                 ocrCheckDuplicateResult.setCompareResultJson(JSONObject.toJSONString(resultMap));
                 ocrCheckDuplicateResult.setCheckDuplicateId(checkDuplicateId);
                 saveList.add(ocrCheckDuplicateResult);
+
+            }
+
         }
+        if (CollectionUtils.isNotEmpty(ocrPictureList)) {
+            taskchildPictureService.createTask(ocrPictureList, ocrPictureList.get(0).getTenantId().toString(), sysUser);
         }
         //批量入库
         boolean b = checkDuplicateResultService.saveOrUpdateBatch(saveList);
@@ -284,6 +288,7 @@ public class OcrCheckDuplicateServiceImpl extends ServiceImpl<OcrCheckDuplicateM
 
     /**
      * 更新图片最高历史阈值
+     *
      * @param saveList
      * @return
      */

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.util.ObjectUtil;
 import cn.jyjz.flowable.common.SystemConstantsOa;
+import cn.jyjz.flowable.service.IFlowInstanceService;
 import cn.jyjz.flowable.service.IFlowTaskService;
 import cn.jyjz.xiaoyao.common.base.param.ParamterPage;
 import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
@@ -10,7 +11,9 @@ import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
 import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
 import cn.jyjz.xiaoyao.common.base.vo.UserToken;
 import cn.jyjz.xiaoyao.common.mybatisplus.util.SearchQueryFormat;
+import cn.jyjz.xiaoyao.oa.from.dataobject.Category;
 import cn.jyjz.xiaoyao.oa.from.dataobject.Userapprove;
+import cn.jyjz.xiaoyao.oa.from.service.CategoryService;
 import cn.jyjz.xiaoyao.oa.from.service.UserapproveService;
 import cn.jyjz.xiaoyao.ocr.dataDao.OcrTaskchildPictureMybatisDao;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture;
@@ -33,9 +36,12 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.task.api.Task;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.stereotype.Service;
 import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -62,6 +68,12 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
     @Resource
     private OcrPictureInfoService pictureInfoService;
 
+    @Resource
+    IFlowInstanceService flowInstanceService;
+
+    @Resource
+    private CategoryService categoryService;
+
     /**
      * 图片真假设置
      *
@@ -278,6 +290,41 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
         return this.update(updateWrapper);
     }
 
+    @Override
+    public void createTask(List<OcrPicture> ocrPictureList, String tenantId, UserToken userToken) {
+        if (null != ocrPictureList && !ocrPictureList.isEmpty()) {
+            //用于标记相似度是否存在百分百的情况
+            for (OcrPicture ocrPicture : ocrPictureList) {
+                //查询项目对象
+                if (null == ocrPicture.getCategoryid()) {
+                    //TODO 没有对应项目，返回提示信息
+                    continue;
+                }
+                Category category = categoryService.getById(ocrPicture.getCategoryid());
+                if (null == category || StringUtils.isBlank(category.getProcessdefinitionid())) {
+                    continue;
+                }
+                //创建工单,如果创建成功，增加标志，用于过滤条件使用
+                OcrTaskchildPicture ocrTaskchildPicture = this.create(ocrPicture, tenantId, userToken, null, null);
+                if (null != ocrTaskchildPicture) {
+                    MockHttpServletRequest request = new MockHttpServletRequest();
+                    RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+                    //发起流程
+                    flowInstanceService.startProcessInstanceById(
+                            category.getProcessdefinitionid(),
+                            null,
+                            request,
+                            ocrTaskchildPicture.getId().toString(),
+                            category.getServicename()
+                    );
+                    //TODO 需要测试
+                    ocrPicture.setTaskchildpictureid(ocrTaskchildPicture.getId().toString());
+                    ocrPictureService.updateById(ocrPicture);
+                }
+            }
+        }
+    }
+
     /**
      * 查询智能识别
      *