修改一键查重启动流程

jyjz-system/jyjz-system-oa/pom.xml

@@ -120,6 +120,10 @@
             <artifactId>lombok</artifactId>
             <version>${lombok.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+        </dependency>
 
     </dependencies>
 </project>

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java

@@ -295,7 +295,7 @@ public class FlowTaskController extends BaseController {
             //如果assigneeId 为空查询发起流程，否则查询待办流程
             if(StringUtils.isNotBlank(assigneeId) && assigneeId.equals(user.getId().toString())){
                 searchQuery.addEqual("assignee",user.getLoginname());
-//                searchQuery.addEqual("states",SystemConstantsOa.OA_STATUS_TYPE_ING.toString());
+                searchQuery.addEqual("states",SystemConstantsOa.OA_STATUS_TYPE_ING.toString());
             }else{
                 searchQuery.addEqual("createuser",user.getLoginname());
             }
@@ -501,4 +501,18 @@ public class FlowTaskController extends BaseController {
 
         //return ResultVoUtil.success();
     }
+
+    /**
+     * 重复任务
+     * @return
+     */
+    @ApiOperation(value="重复流程", notes="重复流程")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true),
+    })
+    @GetMapping("/repetitionTask")
+    @ResponseBody
+    public ResultVo repetitionTask(HttpServletRequest request){
+        return flowTaskService.repetitionTask();
+    }
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/IFlowTaskService.java

@@ -43,12 +43,14 @@ public interface IFlowTaskService {
 
     /**
      * 更新当前节点处理人信息
+     *
      * @param
      * @param processDefinition
      */
     public void updateAssignee(String processInstanceId, String processDefinitionId, ProcessDefinition processDefinition);
 
     void finishedList(PageUtils pageUtils, HttpServletRequest request);
+
     /**
      * 查询我发起的流程实例
      *
@@ -70,36 +72,45 @@ public interface IFlowTaskService {
     /**
      * 查询我发起的流程实例
      * 不做分类
+     *
      * @param query 查询条件
      * @return
      */
     public List<FlowUnionVo> getMyProcessInstances(Map<String, Object> query);
+
     /**
      * 抄送给我的
      *
      * @return
      */
     public IPage<FlowUnionVo> getMyListCc(Map<String, Object> query, UserToken userToken, ParamterPage paramterPage);
+
     /**
      * 查看任务的流程记录
+     *
      * @return
      */
     public List<HistoricTaskInstanceDto> listHistoriceTask(String processInstanceId);
 
     /**
      * 获取当前活动节点列表
+     *
      * @param processInstanceId 实例主键
      * @return
      */
     public List<String> listTask(String processInstanceId);
+
     /**
      * 设置当前审批节点的审批人
      * 目前只多候选组和多个候选人起作用
+     *
      * @param processInstanceId
      */
     public FlowTaskCompleteVO updateNowTaskAssignee(String processInstanceId, String processDefinitionId);
+
     /**
      * 查看当前执行人列表
+     *
      * @param processInstanceId
      * @return
      */
@@ -109,8 +120,10 @@ public interface IFlowTaskService {
      * 设置当前审批节点的
      */
     public List<Task> nowRunTask(String processInstanceId, String processDefinitionId);
+
     /**
      * 撤销流程
+     *
      * @param taskId
      * @param reason
      */
@@ -118,7 +131,15 @@ public interface IFlowTaskService {
 
     /**
      * 重置流程
+     *
      * @param fromid 任务表主键
      */
     public ResultVo removeTask(String fromid, String taskid);
+
+    /**
+     * 查询重复流程
+     *
+     * @return
+     */
+    ResultVo repetitionTask();
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowInstanceServiceImpl.java

@@ -15,19 +15,14 @@ import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil;
 import cn.jyjz.xiaoyao.common.base.util.SpringUtils;
 import cn.jyjz.xiaoyao.common.base.util.StringUtils;
 import cn.jyjz.xiaoyao.common.base.vo.UserToken;
-import cn.jyjz.xiaoyao.framework.security.model.AdminUserModel;
-import cn.jyjz.xiaoyao.framework.security.service.FlowableUserLoginService;
 import cn.jyjz.xiaoyao.oa.from.service.UserViewapproeService;
 import lombok.extern.slf4j.Slf4j;
-import org.flowable.bpmn.model.*;
 import org.flowable.engine.RepositoryService;
-import org.flowable.engine.impl.bpmn.behavior.ParallelMultiInstanceBehavior;
 import org.flowable.engine.repository.ProcessDefinition;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.Task;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.context.request.RequestContextHolder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -48,6 +43,7 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow
     private IFlowTaskService flowTaskService;
     @Resource
     private UserViewapproeService userViewApproeService;
+
     @Override
     public boolean startProcessInstanceById(String procDefId, Map<String, Object> variables, HttpServletRequest request, String formid, String servicename) {
 
@@ -60,11 +56,14 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow
             //表单主键
             formid = iFormCustomService.saveForm(request);
         }
-        
+        String token = RequestBaseUtil.getToken(request);
-        UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
+        String userName = "";
-
+        if (StringUtils.isBlank(token)) {
-        
+            userName = "admin";
-        String userName = userToken.getLoginname();
+        } else {
+            UserToken userToken = this.userTokenService.getUserToken(token);
+            userName = userToken.getLoginname();
+        }
         // 绑定当前认证的账号  我们的认证系统如果使用的是 SpringSecurity的话，默认就会设置当前登录的账号
         //identityService.setAuthenticatedUserId(userName);
         if (null == variables) {
@@ -77,7 +76,7 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow
 
         //业务key 用于待办已办 扩展字段 展示使用
         //我这里以 流程定义key(oa_category_t定义的关键字，逻辑唯一) + 业务表主键（请假表、调岗表等） + 业务表对应的servicename
-        String businessKey= userToken.getLoginname() + SystemConstantsOa.OA_BUSSINESS_KEY_SPLIT+ formid + SystemConstantsOa.OA_BUSSINESS_KEY_SPLIT+ servicename;
+        String businessKey = userName + SystemConstantsOa.OA_BUSSINESS_KEY_SPLIT + formid + SystemConstantsOa.OA_BUSSINESS_KEY_SPLIT + servicename;
 
         ProcessInstance processInstance = null;
 
@@ -122,6 +121,8 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow
             if (StringUtils.isNotBlank(servicename) && StringUtils.isNotBlank(formid)) {
                 iFormCustomService.delForm(formid);
             }
+        }finally {
+            RequestContextHolder.resetRequestAttributes();
         }
         return false;
     }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java

@@ -1122,6 +1122,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                     HistoricTaskInstanceDto dto = new HistoricTaskInstanceDto();
                     dto.setTaskId(taskHiInstance.getId());
                     dto.setTaskName(taskHiInstance.getName());
+                    flowUnionVo.setNodeName(taskHiInstance.getName());
                     dto.setFinishTime(taskHiInstance.getEndTime());
                     if(taskHiInstance.getDurationInMillis() != null){
                         dto.setDuration(taskHiInstance.getDurationInMillis()/1000 + "秒");
@@ -1458,4 +1459,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         return ResultVoUtil.success();
     }
 
+    @Override
+    public ResultVo repetitionTask() {
+        return ResultVoUtil.success(flowableccMybatisDao.repetitionTask());
+    }
+
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/dataDao/FlowableccMybatisDao.java

@@ -35,4 +35,6 @@ public interface FlowableccMybatisDao extends BaseMapper<Flowablecc> {
      * @return
      */
     List<UserDistionaryVo> selectUserByFromid(String fromid);
+
+    List<Map<String,Object>> repetitionTask();
 }

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

@@ -33,6 +33,8 @@ public interface OcrPictureService extends BaseService<OcrPicture>  {
 
     public ResultVo createTaskChild(List<OcrPicture> ocrPictureList, String tenantId , UserToken sysUser, String search_month, HttpServletRequest req, String buessinessno);
 
+    public ResultVo createTaskChild(List<OcrPicture> ocrPictureList, String tenantId);
+
     /**
      * 查询工单图片信息
      * @param tenantId

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

@@ -2,7 +2,6 @@ package cn.jyjz.xiaoyao.ocr.service.impl;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import cn.jyjz.flowable.domain.vo.FlowInstanceVo;
 import cn.jyjz.flowable.service.IFlowInstanceService;
 import cn.jyjz.xiaoyao.abase.service.SeqManageService;
 import cn.jyjz.xiaoyao.admin.service.LogService;
@@ -18,36 +17,31 @@ import cn.jyjz.xiaoyao.ocr.util.DataDictionaryUtil;
 import cn.jyjz.xiaoyao.ocr.util.ImageClassUtil;
 import cn.jyjz.xiaoyao.ocr.util.SearchEnum;
 import cn.jyjz.xiaoyao.ocr.util.SearchParaFormatting;
-import cn.jyjz.xiaoyao.ocr.util.httputil.HttpClient;
-import cn.jyjz.xiaoyao.ocr.util.httputil.HttpHeader;
-import cn.jyjz.xiaoyao.ocr.util.httputil.HttpParamers;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.time.DateFormatUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.hpsf.Decimal;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.core.parameters.P;
+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.transaction.annotation.Transactional;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+
 /**
  * 业务层实现
  */
@@ -94,6 +88,7 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
      */
     @Autowired
     DataDictionaryUtil dataDictionaryUtil;
+
     public ResultVo createTaskChild(List<OcrPicture> ocrPictureList, String tenantId, UserToken sysUser, String search_month, HttpServletRequest request, String buessinessno) {
 
         //图片错误信息
@@ -278,6 +273,160 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
         }
         return ResultVoUtil.error("失败。");
     }
+    public ResultVo createTaskChild(List<OcrPicture> ocrPictureList, String tenantId) {
+
+        //图片错误信息
+        StringBuffer error = new StringBuffer();
+        //项目错误信息
+        StringBuffer errorProject = new StringBuffer();
+        //流程错误信息
+        StringBuffer errorFlow = new StringBuffer();
+
+        //记录任务相似度为百分百的任务主键
+        List<Long> pointsList = new ArrayList<>();
+        //图片信息不能为空
+        if (null != ocrPictureList && !ocrPictureList.isEmpty()) {
+            //生成任务包
+            //String packageName = seqManageService.getSeqNextNo("AI任务包");
+
+            //用于标记相似度是否存在百分百的情况
+
+            List<OcrPicture> newList = new ArrayList<>();
+            for (OcrPicture ocrPicture : ocrPictureList) {
+                //图片查重的比对图片集合
+                List<OcrPicture> compareList = new ArrayList<>();
+
+                //非历史图片主键集合
+                List<String> picturecompareList = new ArrayList<>();
+
+                boolean havePoint = false;
+                //二次遍历进行比对
+                for (OcrPicture ocrPictureNext : ocrPictureList) {
+
+                    if (ocrPictureNext.getId().longValue() == ocrPicture.getId().longValue()) {
+                        continue;
+                    }
+                    //TODO 接口请求判断重复情况
+                    JSONObject jsonObjectSimi = ImageClassUtil.getSimilarity(ocrPicture.getImgurl(),
+                            ocrPictureNext.getImgurl(),
+                            null);
+                    System.out.println("responseDataXs--code = [" + jsonObjectSimi.get("code") + "]");
+                    System.out.println("responseDataXs--similarity = [" + jsonObjectSimi.get("similarity") + "]");
+
+                    String resultValue = "";
+
+                    //返回内容为零，表示成功，否则表示失败
+                    if (null != jsonObjectSimi && jsonObjectSimi.getString("code").equals("0")) {
+
+                        resultValue = jsonObjectSimi.getString("similarity");
+                        ocrPictureNext.setResult(resultValue);
+                    } else {
+                        resultValue = "0";
+                        ocrPictureNext.setResult(resultValue);
+                    }
+
+                    BigDecimal b1 = new BigDecimal(resultValue);
+                    BigDecimal b2 = new BigDecimal("100");
+                    int val = b1.compareTo(b2);
+                    if (val == 0) {
+                        havePoint = true;
+                    }
+
+                    //如果当前图片未生成任务需要临时保存
+                    if (ocrPictureNext.getTaskstatus().equals("0")) {
+                        picturecompareList.add(ocrPictureNext.getId().toString());
+                    }
+
+                    compareList.add(ocrPictureNext);
+                }
+                bubbleSortOpt(compareList);
+                //从大到小进行排序
+                ocrPicture.setListCom(compareList);
+
+                //非历史图片主键集合
+                ocrPicture.setPicturecompareList(picturecompareList);
+
+                //查询项目对象
+                if (null == ocrPicture.getCategoryid()) {
+                    //TODO 没有对应项目，返回提示信息
+                    if (null != error && error.length() > 1) {
+                        error.append("," + ocrPicture.getImgname());
+                    } else {
+                        error.append(ocrPicture.getImgname());
+                    }
+                    continue;
+                }
+                Category category = categoryService.getById(ocrPicture.getCategoryid());
+                if (null == category) {
+                    if (null != errorProject && errorProject.length() > 1) {
+                        errorProject.append("," + ocrPicture.getImgname());
+                    } else {
+                        errorProject.append(ocrPicture.getImgname());
+                    }
+                    continue;
+                } else if (StringUtils.isBlank(category.getProcessdefinitionid())) {
+                    if (null != errorFlow && errorFlow.length() > 1) {
+                        errorFlow.append("," + category.getCategoryname());
+                    } else {
+                        errorFlow.append(category.getCategoryname());
+                    }
+                    continue;
+                }
+                UserToken userToken = new UserToken();
+                userToken.setLoginname("admin");
+                userToken.setUsername("admin");
+                //创建工单,如果创建成功，增加标志，用于过滤条件使用
+                OcrTaskchildPicture ocrTaskchildPicture = this.ocrTaskchildPictureService.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()
+                    );
+
+                    if (havePoint) {
+                        pointsList.add(ocrTaskchildPicture.getId());
+                    }
+
+                    //TODO 需要测试
+                    ocrPicture.setTaskchildpictureid(ocrTaskchildPicture.getId().toString());
+                    ocrPicture.setWorkStatus("1");
+                    this.updateById(ocrPicture);
+                }
+
+                newList.add(ocrPicture);
+            }
+
+            //批量更新 pointsList 主键相似度为百分百的数据
+            if (null != pointsList && !pointsList.isEmpty()) {
+                this.ocrTaskchildPictureService.markPoint(pointsList);
+            }
+            //原主图设置为任务包已经生成
+            for (OcrPicture ocrPicture : newList) {
+                ocrPicture.setTaskstatus("1");
+                this.updateById(ocrPicture);
+            }
+
+            if (StringUtils.isBlank(error) && StringUtils.isBlank(errorProject) && StringUtils.isBlank(errorFlow)) {
+                return ResultVoUtil.success();
+            } else {
+
+                String msg = (StringUtils.isBlank(error)) ? "" : error.toString() + "，图片没有对应项目，无法查重。";
+                msg = msg + ((StringUtils.isBlank(errorProject)) ? "" : errorProject.toString() + "，图片没有对应项目，无法查重。");
+                msg = msg + ((StringUtils.isBlank(errorFlow)) ? "" : errorFlow.toString() + "，项目没有配置审批流程，无法查重。");
+                return ResultVoUtil.success(msg);
+            }
+
+
+        }
+        return ResultVoUtil.error("失败。");
+    }
+
     public void bubbleSortOpt(List<OcrPicture> compareList) {
 
         if (null == compareList) {
@@ -294,8 +443,10 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
             }
         }
     }
+
     /**
      * 保存接口传来的json数据
+     *
      * @param jsonArray
      * @return
      */
@@ -305,6 +456,7 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
 
         return list;
     }
+
     public List<OcrPicture> listPage(Wrapper<OcrPicture> queryWrapper) {
 
         long count = this.count(queryWrapper);
@@ -353,6 +505,7 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
 
     /**
      * 查询工单图片信息
+     *
      * @return
      */
     public List<OcrPicture> listByTaskChild(List<String> pictureidlist) {
@@ -381,6 +534,7 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
 
     /**
      * 查询工单下的图片以及查重结果
+     *
      * @param ocrTaskchildPicture
      * @return
      */
@@ -537,6 +691,7 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
         //3.添加图片信息
         if (this.saveBatch(ocrPictureList)) {
 
+            this.createTaskChild(ocrPictureList, ocrPictureList.get(0).getTenantId().toString());
             return ocrPictureList.size();
         }
         return 0;
@@ -544,6 +699,7 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
 
     /**
      * 格式化筛选关系
+     *
      * @param queryWrapper
      * @param usersearchchild
      * @return
@@ -567,6 +723,7 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
 
     /**
      * 格式化查询类型
+     *
      * @param queryWrapper
      * @param usersearchchild
      * @return

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDownloadTask.java

@@ -7,6 +7,7 @@ import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture;
 import cn.jyjz.xiaoyao.ocr.service.OcrPictureService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -63,6 +64,9 @@ public class PictureDownloadTask implements Runnable{
                 if (pictureSourceResult.getProjectNo() != null) {
                     picture.setProjectid(pictureSourceResult.getProjectNo().toString());
                 }
+                //项目id
+                picture.setCategoryid(251374070600303007L);
+
                 //项目名称
                 picture.setPicturename(pictureSourceResult.getProjectName());
                 //项目状态

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

@@ -181,4 +181,13 @@
 		from OA_SUMMARY_VIEW
 		<include refid="Base_Where_union"></include>
 	</select>
+
+	<select id="repetitionTask" resultType="java.util.Map">
+		SELECT REPETITION,count(1) count
+		FROM
+			OA_SUMMARY_VIEW
+		GROUP BY REPETITION
+		HAVING count(1)>1
+
+	</select>
 </mapper>