From 5b4e7ae2998e9c947f0f6b36aa6063aa9a5a7cb9 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 09 三月 2025 23:29:15 +0800
Subject: [PATCH] 容缺补办实现
---
business/src/main/resources/mapper/ProjectProcessMapper.xml | 23 +++
business/src/main/java/com/ycl/domain/vo/FlowableVarVO.java | 57 +++++++++
business/src/main/java/com/ycl/controller/FlowTaskController.java | 14 +
business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java | 177 +++++++++++++++++++++++++++--
business/src/main/java/com/ycl/mapper/ProjectProcessMapper.java | 29 ++++
business/src/main/java/com/ycl/service/IFlowTaskService.java | 7 +
6 files changed, 291 insertions(+), 16 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/FlowTaskController.java b/business/src/main/java/com/ycl/controller/FlowTaskController.java
index 9bc8d62..b4a24ac 100644
--- a/business/src/main/java/com/ycl/controller/FlowTaskController.java
+++ b/business/src/main/java/com/ycl/controller/FlowTaskController.java
@@ -98,9 +98,9 @@
}
@ApiOperation(value = "鏌ョ湅浠诲姟", response = FormDetailVO.class)
- @GetMapping(value = "/detail/{taskId}")
- public AjaxResult detail(@ApiParam(value = "娴佺▼浠诲姟Id") @PathVariable(value = "taskId") String taskId) {
- return flowTaskService.detail(taskId);
+ @GetMapping(value = "/detail/{processInsId}/{taskId}")
+ public AjaxResult detail(@ApiParam(value = "娴佺▼瀹炰緥Id") @PathVariable(value = "processInsId") String processInsId, @ApiParam(value = "娴佺▼浠诲姟Id") @PathVariable(value = "taskId") String taskId) {
+ return flowTaskService.detail(processInsId, taskId);
}
@@ -112,6 +112,14 @@
return flowTaskService.completeSubmitForm(taskId, variables, Boolean.TRUE);
}
+ @ApiOperation(value = "瀹圭己琛ヤ氦")
+ @Log(title = "瀹圭己琛ヤ氦", businessType = BusinessType.INSERT)
+ @PostMapping("/wait/complete/form/{taskId}")
+ public AjaxResult waitCompleteSubmitForm(@ApiParam(value = "娴佺▼瀹氫箟id") @PathVariable(value = "taskId") String taskId,
+ @ApiParam(value = "鍙橀噺闆嗗悎,json瀵硅薄") @RequestBody Map<String, Object> variables) throws IOException {
+ return flowTaskService.waitCompleteSubmitForm(taskId, variables, Boolean.TRUE);
+ }
+
@ApiOperation(value = "瀹屾垚瀹℃壒浠诲姟")
@Log(title = "瀹℃壒浠诲姟", businessType = BusinessType.UPDATE)
@PostMapping(value = "/complete")
diff --git a/business/src/main/java/com/ycl/domain/vo/FlowableVarVO.java b/business/src/main/java/com/ycl/domain/vo/FlowableVarVO.java
new file mode 100644
index 0000000..fc63a0c
--- /dev/null
+++ b/business/src/main/java/com/ycl/domain/vo/FlowableVarVO.java
@@ -0,0 +1,57 @@
+package com.ycl.domain.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * flowable鍙橀噺
+ *
+ * @author锛歺p
+ * @date锛�2025/3/9 19:07
+ */
+@Data
+public class FlowableVarVO {
+
+ private String ID_;
+
+ /**
+ * 娴佺▼瀹炰緥id
+ */
+ private String PROC_INST_ID_;
+
+ /**
+ * 鎵цid
+ */
+ private String EXECUTION_ID_;
+
+ /**
+ * 鍙橀噺key
+ */
+ private String NAME_;
+
+ /**
+ * 鍊肩被鍨�
+ */
+ private String VAR_TYPE_;
+
+ /**
+ * 浜岃繘鍒舵暟鎹甶d锛屼竴鑸氨鏄痡son鏍煎紡鏁版嵁锛屽琛ㄥ崟json
+ */
+ private String BYTEARRAY_ID_;
+
+ private Double DOUBLE_;
+
+ private Long LONG_;
+
+ private String TEXT_;
+
+ private String TEXT2_;
+
+ private Date CREATE_TIME_;
+
+ private Date LAST_UPDATED_TIME_;
+
+
+
+}
diff --git a/business/src/main/java/com/ycl/mapper/ProjectProcessMapper.java b/business/src/main/java/com/ycl/mapper/ProjectProcessMapper.java
index f83d080..dbb9c38 100644
--- a/business/src/main/java/com/ycl/mapper/ProjectProcessMapper.java
+++ b/business/src/main/java/com/ycl/mapper/ProjectProcessMapper.java
@@ -5,6 +5,7 @@
import com.ycl.domain.entity.ProjectProcess;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.domain.vo.FlowableVarVO;
import com.ycl.domain.vo.ProjectEngineeringVO;
import com.ycl.domain.vo.ProjectProcessVO;
import com.ycl.domain.form.ProjectProcessForm;
@@ -54,4 +55,32 @@
* @return
*/
List<String> getNormalInsIds();
+
+ /**
+ * 鏌ヨflowable涓殑鏌愪釜鍙橀噺鐨勬暟鎹瓨鍌╥d
+ *
+ * @param processInsId
+ * @param keyName
+ * @return
+ */
+ FlowableVarVO getHisByteId(@Param("processInsId") String processInsId, @Param("keyName") String keyName);
+ FlowableVarVO getRuByteId(@Param("processInsId") String processInsId, @Param("keyName") String keyName);
+
+ /**
+ * 淇濆瓨flowable鍙橀噺
+ *
+ * @param v
+ */
+ void insertHisFlowableVar(@Param("v") FlowableVarVO v);
+ void insertRunFlowableVar(@Param("v") FlowableVarVO v);
+
+ /**
+ * 淇濆瓨flowable鍙橀噺鍊�
+ *
+ * @param bytearray_id_
+ * @param rev_
+ * @param name_
+ * @param objectToBytes
+ */
+ void insertByteArray(@Param("id_") String bytearray_id_, @Param("rev_") int rev_, @Param("name_") String name_, @Param("bytes_") Object objectToBytes);
}
diff --git a/business/src/main/java/com/ycl/service/IFlowTaskService.java b/business/src/main/java/com/ycl/service/IFlowTaskService.java
index ae25511..fab464a 100644
--- a/business/src/main/java/com/ycl/service/IFlowTaskService.java
+++ b/business/src/main/java/com/ycl/service/IFlowTaskService.java
@@ -4,6 +4,7 @@
import com.ycl.domain.vo.FlowQueryVo;
import com.ycl.domain.vo.FlowTaskVo;
+import java.io.IOException;
import java.io.InputStream;
import java.util.Map;
@@ -225,11 +226,15 @@
*/
AjaxResult completeSubmitForm(String taskId, Map<String, Object> variables, Boolean addLog);
+ AjaxResult waitCompleteSubmitForm(String taskId, Map<String, Object> variables, Boolean addLog) throws IOException;
+
/**
* 鏌ョ湅浠诲姟
*
+ *
+ * @param processInsId
* @param taskId
* @return
*/
- AjaxResult detail(String taskId);
+ AjaxResult detail(String processInsId, String taskId);
}
diff --git a/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java b/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
index b39a37e..0c2d7a4 100644
--- a/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
@@ -51,6 +51,7 @@
import org.flowable.bpmn.model.*;
import org.flowable.common.engine.api.FlowableException;
import org.flowable.common.engine.api.FlowableObjectNotFoundException;
+import org.flowable.common.engine.impl.persistence.StrongUuidGenerator;
import org.flowable.engine.ProcessEngineConfiguration;
import org.flowable.engine.history.HistoricActivityInstance;
import org.flowable.engine.history.HistoricProcessInstance;
@@ -70,10 +71,11 @@
import org.flowable.task.api.history.HistoricTaskInstanceQuery;
import org.springframework.beans.BeanUtils;
import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.io.InputStream;
+import java.io.*;
import java.lang.reflect.Field;
import java.nio.charset.StandardCharsets;
import java.util.*;
@@ -186,6 +188,134 @@
null));
}
return AjaxResult.success("鎻愪氦鎴愬姛");
+ }
+
+ /**
+ * 瀹圭己琛ヤ氦
+ *
+ * @param taskId 浠诲姟id
+ * @param variables 琛ㄥ崟鏁版嵁
+ * @param addLog
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public AjaxResult waitCompleteSubmitForm(String taskId, Map<String, Object> variables, Boolean addLog) throws IOException {
+ List<HistoricTaskInstance> hisTasks = historyService.createHistoricTaskInstanceQuery().taskId(taskId).orderByHistoricTaskInstanceStartTime().desc().list();
+ if (CollectionUtils.isEmpty(hisTasks) || Objects.isNull(hisTasks.get(0))) {
+ return AjaxResult.error("浠诲姟涓嶅瓨鍦�");
+ }
+ HistoricTaskInstance task = hisTasks.get(0);
+ ProjectProcess projectProcess = new LambdaQueryChainWrapper<>(projectProcessMapper)
+ .eq(ProjectProcess::getProcessInsId, task.getProcessInstanceId())
+ .eq(ProjectProcess::getProcessDefId, task.getProcessDefinitionId())
+ .one();
+ if (Objects.isNull(projectProcess)) {
+ return AjaxResult.error("椤圭洰娴佺▼鏈粦瀹�");
+ }
+ // 鏌ュ嚭瀛楀吀涓渶瑕佹敞鍏ョ殑瀛楁淇℃伅
+ List<String> dictList = sysDictDService.selectDictDataByType("flow_variables").stream().map(SysDictData::getDictValue).collect(Collectors.toList());
+ Map<String, Object> newV = new HashMap<>(2);
+ if (!org.springframework.util.CollectionUtils.isEmpty(variables)) {
+ for (String key : variables.keySet()) {
+ newV.put(task.getTaskDefinitionKey() + "&" + key, variables.get(key));
+ // 瀛楀吀閲屾湁灏变笉鍋氬鐞�
+ if (!CollectionUtils.isEmpty(dictList) && dictList.contains(key)) {
+ newV.put(key,variables.get(key));
+ }
+ }
+ }
+ ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(task.getProcessInstanceId()).singleResult();
+ Date now = new Date();
+ for (String key : newV.keySet()) {
+ FlowableVarVO var = null;
+ if (Objects.isNull(processInstance)) {
+ // 鏌ヨ鍘嗗彶娴佺▼鍙橀噺
+ var = projectProcessMapper.getHisByteId(projectProcess.getProcessInsId(), key);
+ } else {
+ // 鏌ヨ杩愯鏃舵祦绋嬪彉閲�
+ var = projectProcessMapper.getRuByteId(projectProcess.getProcessInsId(), key);
+ }
+
+ if (Objects.isNull(var)) {
+ // 娌℃湁杩欎釜鍙橀噺鏂板鍗冲彲
+ FlowableVarVO run = new FlowableVarVO();
+ FlowableVarVO v = new FlowableVarVO();
+ v.setNAME_(key);
+ v.setPROC_INST_ID_(task.getProcessInstanceId());
+ v.setEXECUTION_ID_(task.getProcessInstanceId());
+ v.setCREATE_TIME_(now);
+ v.setLAST_UPDATED_TIME_(now);
+ v.setID_(new StrongUuidGenerator().getNextId());
+
+ BeanUtils.copyProperties(v, run);
+ run.setID_(new StrongUuidGenerator().getNextId());
+ if (newV.get(key) instanceof String) {
+ v.setVAR_TYPE_("string");
+ v.setTEXT_((String) newV.get(key));
+ run.setVAR_TYPE_("string");
+ run.setTEXT_((String) newV.get(key));
+ } else if (newV.get(key) instanceof Integer) {
+ v.setVAR_TYPE_("integer");
+ v.setLONG_((Long) newV.get(key));
+ v.setTEXT_((String) newV.get(key));
+ run.setVAR_TYPE_("integer");
+ run.setLONG_((Long) newV.get(key));
+ run.setTEXT_((String) newV.get(key));
+ } else if (newV.get(key) instanceof Long) {
+ v.setVAR_TYPE_("long");
+ v.setLONG_((Long) newV.get(key));
+ v.setTEXT_((String) newV.get(key));
+ run.setVAR_TYPE_("long");
+ run.setLONG_((Long) newV.get(key));
+ run.setTEXT_((String) newV.get(key));
+ } else if (newV.get(key) instanceof Boolean) {
+ v.setVAR_TYPE_("boolean");
+ v.setLONG_((Long) newV.get(key));
+ v.setTEXT_((String) newV.get(key));
+ run.setVAR_TYPE_("boolean");
+ run.setLONG_((Long) newV.get(key));
+ run.setTEXT_((String) newV.get(key));
+ } else {
+ // 鍏跺畠绫诲瀷鐨勮〃鍗曟暟鎹細濡傚浘鐗囥�佹枃浠跺崟鐙瓨琛ㄧ殑銆傚巻鍙层�佽繍琛屼腑鐨勬祦绋嬮渶鍚勫瓨涓�浠�
+ v.setVAR_TYPE_("serializable");
+ v.setBYTEARRAY_ID_(new StrongUuidGenerator().getNextId());
+ projectProcessMapper.insertByteArray(v.getBYTEARRAY_ID_(), 1, "hist.var-" + key, newV.get(key));
+
+ run.setVAR_TYPE_("serializable");
+ run.setBYTEARRAY_ID_(new StrongUuidGenerator().getNextId());
+ projectProcessMapper.insertByteArray(run.getBYTEARRAY_ID_(), 1, "var-" + key, newV.get(key));
+ }
+
+ projectProcessMapper.insertHisFlowableVar(v);
+ projectProcessMapper.insertRunFlowableVar(run);
+ }
+ }
+ // 淇濆瓨鏃ュ織
+ publisher.publishEvent(new TaskLogEvent(this, null,
+ SecurityUtils.getUserId(),
+ projectProcess.getProjectId(),
+ projectProcess.getProcessInsId(),
+ taskId,
+ task.getTaskDefinitionKey(),
+ task.getName(),
+ ProcessLogEventTypeEnum.FINISHED,
+ null));
+
+ return AjaxResult.success("鎻愪氦鎴愬姛");
+ }
+
+ // 灏嗗璞¤浆鎹负 byte[]
+ public static byte[] objectToBytes(Object obj) throws IOException {
+ if (Objects.isNull(obj)) {
+ return null;
+ }
+ try (ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(bos)) {
+ oos.writeObject(obj); // 搴忓垪鍖栧璞�
+ oos.flush();
+ return bos.toByteArray(); // 杩斿洖瀛楄妭鏁扮粍
+ }
}
/**
@@ -1320,24 +1450,30 @@
}
@Override
- public AjaxResult detail(String taskId) {
- Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+ public AjaxResult detail(String processInsId, String taskId) {
+ ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().includeProcessVariables().processInstanceId(processInsId).singleResult();
// 娴佺▼鍙橀噺
Map<String, Object> parameters = new HashMap<>();
- if (Objects.isNull(task)) {
- // 濡傛灉涓虹┖锛屽彲鑳芥槸浠诲姟宸茬粡缁撴潫
+ if (Objects.isNull(processInstance)) {
+
+ // 濡傛灉涓虹┖锛岃〃鏄庢祦绋嬪凡缁忕粨鏉�
+ HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery().includeProcessVariables().processInstanceId(processInsId).singleResult();
+ if (Objects.isNull(historicProcessInstance)) {
+ throw new RuntimeException("娴佺▼涓嶅瓨鍦�");
+ }
+
List<HistoricTaskInstance> hisTasks = historyService.createHistoricTaskInstanceQuery()
.taskId(taskId)
.finished()
.includeProcessVariables()
- .orderByTaskCreateTime()
+ .orderByHistoricTaskInstanceStartTime()
.desc()
.list();
if (CollectionUtils.isNotEmpty(hisTasks) && Objects.isNull(hisTasks.get(0))) {
throw new RuntimeException("璇ヤ换鍔′笉瀛樺湪");
}
HistoricTaskInstance hisTask = hisTasks.get(0);
- parameters = hisTask.getProcessVariables();
+ parameters = historicProcessInstance.getProcessVariables();
List<FormDetailVO> beforeNodes = this.getBeforeNodeForm(parameters, hisTask.getFormKey(), hisTask.getName(), hisTask.getProcessDefinitionId(), hisTask.getTaskDefinitionKey(), Boolean.TRUE);
List<FormDetailVO> dataList = new ArrayList<>(2);
Map<String, List<FormDetailVO>> map = new HashMap<>(2);
@@ -1389,8 +1525,25 @@
}).collect(Collectors.toList());
return AjaxResult.success(vos);
} else {
- parameters = taskService.getVariables(taskId);
- List<FormDetailVO> beforeNodes = this.getBeforeNodeForm(parameters, task.getFormKey(), task.getName(), task.getProcessDefinitionId(), task.getTaskDefinitionKey(), Boolean.TRUE);
+ parameters = processInstance.getProcessVariables();
+ Task task = taskService.createTaskQuery().taskId(taskId).processInstanceId(processInsId).singleResult();
+ List<FormDetailVO> beforeNodes = new ArrayList<>();
+ if (Objects.nonNull(task)) {
+ beforeNodes = this.getBeforeNodeForm(parameters, task.getFormKey(), task.getName(), task.getProcessDefinitionId(), task.getTaskDefinitionKey(), Boolean.TRUE);
+ } else {
+ List<HistoricTaskInstance> hisTasks = historyService.createHistoricTaskInstanceQuery()
+ .taskId(taskId)
+ .finished()
+ .includeProcessVariables()
+ .orderByHistoricTaskInstanceStartTime()
+ .desc()
+ .list();
+ if (CollectionUtils.isNotEmpty(hisTasks) && Objects.isNull(hisTasks.get(0))) {
+ throw new RuntimeException("璇ヤ换鍔′笉瀛樺湪");
+ }
+ HistoricTaskInstance hisTask = hisTasks.get(0);
+ beforeNodes = this.getBeforeNodeForm(parameters, hisTask.getFormKey(), hisTask.getName(), hisTask.getProcessDefinitionId(), hisTask.getTaskDefinitionKey(), Boolean.TRUE);
+ }
List<FormDetailVO> dataList = new ArrayList<>(2);
Map<String, List<FormDetailVO>> map = new HashMap<>(2);
beforeNodes.stream().forEach(node -> {
@@ -1398,7 +1551,7 @@
dataList.add(node);
} else {
List<HistoricTaskInstance> beforeTasks = historyService.createHistoricTaskInstanceQuery()
- .processInstanceId(task.getProcessInstanceId())
+ .processInstanceId(processInsId)
.finished()
.taskDefinitionKey(node.getBeforeNodeDefId())
.orderByTaskCreateTime()
@@ -1422,14 +1575,14 @@
}
List<DoFormDetailVO> vos = dataList.stream().map(node -> {
if (node.getCurrent()) {
- if (processLogService.taskIsHangup(taskId, task.getProcessInstanceId())) {
+ if (processLogService.taskIsHangup(taskId, processInsId)) {
node.setTaskStatus(TaskStatusEnum.HANGUP);
}
}
// 鍒ゆ柇浠诲姟鏄惁瀛樺湪鐗规畩鎿嶄綔(濡傝烦杩囥�佽浆鍔炵瓑)锛岄渶瑕佸湪鍓嶇灞曠ず鍑烘潵
ProcessLogQuery query = new ProcessLogQuery();
query.setTaskDefKey(node.getUserTask().getId());
- query.setProcessInsId(task.getProcessInstanceId());
+ query.setProcessInsId(processInsId);
Result result = processLogService.projectProcessLogPage(query);
List<ProcessLogVO> logList = (List<ProcessLogVO>) result.get("data");
DoFormDetailVO vo = new DoFormDetailVO();
diff --git a/business/src/main/resources/mapper/ProjectProcessMapper.xml b/business/src/main/resources/mapper/ProjectProcessMapper.xml
index 5008916..5890f54 100644
--- a/business/src/main/resources/mapper/ProjectProcessMapper.xml
+++ b/business/src/main/resources/mapper/ProjectProcessMapper.xml
@@ -178,4 +178,27 @@
SELECT TPP.process_ins_id FROM t_project_engineering TPE INNER JOIN t_project_process TPP ON TPE.id = TPP.project_id AND TPE.deleted = 0 AND TPP.project_type = 'ENGINEERING'
</select>
+ <select id="getHisByteId" resultType="com.ycl.domain.vo.FlowableVarVO">
+ SELECT ID_, PROC_INST_ID_, EXECUTION_ID_, NAME_, VAR_TYPE_, BYTEARRAY_ID_ FROM act_hi_varinst WHERE PROC_INST_ID_ = #{processInsId} AND NAME_ = #{keyName}
+ </select>
+
+ <select id="getRuByteId" resultType="com.ycl.domain.vo.FlowableVarVO">
+ SELECT ID_, PROC_INST_ID_, EXECUTION_ID_, NAME_, TYPE_ as VAR_TYPE_, BYTEARRAY_ID_ FROM act_ru_variable WHERE PROC_INST_ID_ = #{processInsId} AND NAME_ = #{keyName}
+ </select>
+
+
+ <insert id="insertHisFlowableVar" parameterType="com.ycl.domain.vo.FlowableVarVO">
+ insert into act_hi_varinst(ID_,REV_, PROC_INST_ID_, EXECUTION_ID_, NAME_, VAR_TYPE_,BYTEARRAY_ID_,DOUBLE_,LONG_, TEXT_, CREATE_TIME_, LAST_UPDATED_TIME_)
+ values (#{v.ID_}, 0, #{v.PROC_INST_ID_}, #{v.EXECUTION_ID_}, #{v.NAME_}, #{v.VAR_TYPE_}, #{v.BYTEARRAY_ID_}, #{v.DOUBLE_}, #{v.LONG_}, #{v.TEXT_}, #{v.CREATE_TIME_}, #{v.LAST_UPDATED_TIME_})
+ </insert>
+
+ <insert id="insertRunFlowableVar" parameterType="com.ycl.domain.vo.FlowableVarVO">
+ insert into act_ru_variable(ID_,REV_, PROC_INST_ID_, EXECUTION_ID_, NAME_, TYPE_,BYTEARRAY_ID_,DOUBLE_,LONG_, TEXT_)
+ values (#{v.ID_}, 1, #{v.PROC_INST_ID_}, #{v.EXECUTION_ID_}, #{v.NAME_}, #{v.VAR_TYPE_}, #{v.BYTEARRAY_ID_}, #{v.DOUBLE_}, #{v.LONG_}, #{v.TEXT_})
+ </insert>
+
+ <insert id="insertByteArray">
+ insert into act_ge_bytearray(ID_, REV_, NAME_, BYTES_) values (#{id_}, #{rev_}, #{name_}, #{bytes_, jdbcType=BLOB})
+ </insert>
+
</mapper>
--
Gitblit v1.8.0