FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-wkflow-rest!44
This commit is contained in:
高嵩
2023-05-17 17:57:50 +08:00
parent db421bbc1c 1442daae06
commit 8726b34418
12 changed files with 95 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessModelHisController.java
+3 -3
View File
@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.business_main.datas.controller;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessEvaluationHis;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessModelHis;
import com.ydw.bat.wkflow.business_main.datas.entity.OnlineFileLog;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessEvaluationHisService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessModelHisService;
import com.ydw.bat.wkflow.util.Utils;
@@ -231,9 +232,8 @@ public class BusProcessModelHisController {
}
@PostMapping("/selectOnlineFile")
public List<BusProcessModelHis> selectOnlineFile(@RequestParam("taskId") String taskId) {
List<BusProcessModelHis> processModelHisList = busProcessModelHisService.selectOnlineFile(taskId);
return processModelHisList;
public OnlineFileLog selectOnlineFile(@RequestParam("onlineFileId") String onlineFileId) {
return busProcessModelHisService.selectOnlineFile(onlineFileId);
}
}
src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/OnlineFileLog.java
+51
View File
@@ -0,0 +1,51 @@
package com.ydw.bat.wkflow.business_main.datas.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
public class OnlineFileLog {
@ApiModelProperty(value = "主键")
@TableId(value = "ID", type = IdType.UUID)
private String id;
@TableField("HIS_ID")
private String hisId;
@TableField("ATT_FILE_ID")
private String attFileId;
@TableField("FILE_NAME")
private String fileName;
@TableField("DLD_FILE_NAME")
private String oldFileName;
@TableField("FILE_SUFFIX")
private String fileSuffix;
@TableField("FILE_PATH")
private String filePath;
@TableField("COUNT")
private Integer count;
@TableField("CREATE_TIME")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@TableField("UPDATE_TIME")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
@TableField(exist = false)
private byte[] bytes;
}
src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessModelHisService.java
+2 -1
View File
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessEvaluationHis;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessModelHis;
import com.ydw.bat.wkflow.business_main.datas.entity.OnlineFileLog;
import java.util.List;
@@ -37,5 +38,5 @@ public interface IBusProcessModelHisService extends IService<BusProcessModelHis>
void saveBussTemplateFile(JSONObject object, String pid);
List<BusProcessModelHis> selectOnlineFile(String taskId);
OnlineFileLog selectOnlineFile(String onlineFileId);
}
src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessModelHisServiceImpl.java
+31 -18
View File
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessEvaluationHis;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessModelHis;
import com.ydw.bat.wkflow.business_main.datas.entity.OnlineFileLog;
import com.ydw.bat.wkflow.business_main.datas.mapper.BusProcessEvaluationHisMapper;
import com.ydw.bat.wkflow.business_main.datas.mapper.BusProcessModelHisMapper;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessEvaluationHisService;
@@ -18,8 +19,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.io.File;
import java.io.IOException;
import java.io.*;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@@ -146,25 +146,38 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
}
@Override
public List<BusProcessModelHis> selectOnlineFile(String taskId) {
QueryWrapper<BusProcessModelHis> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("TASK_ID",taskId);
List<BusProcessModelHis> busProcessModelHis = baseMapper.selectList(objectQueryWrapper);
if(!busProcessModelHis.isEmpty()){
String pId = busProcessModelHis.get(0).getPId();
QueryWrapper<BusProcessModelHis> objectQueryWrapperPid = new QueryWrapper<>();
objectQueryWrapperPid.eq("P_ID",pId);
List<BusProcessModelHis> busProcessModelHisList = baseMapper.selectList(objectQueryWrapperPid);
if(!busProcessModelHisList.isEmpty()){
for(BusProcessModelHis data : busProcessModelHisList){
if(StringUtils.isNotBlank(data.getEditFilePath())){
data.setEditFilePath(downloadUrl+filePath+data.getEditFilePath());
}
public OnlineFileLog selectOnlineFile(String onlineFileId) {
BusProcessModelHis busProcessModelHis = baseMapper.selectById(onlineFileId);
OnlineFileLog onlineFileLog = new OnlineFileLog();
byte[] bytes = new byte[0];
if(busProcessModelHis!=null){
//获取当前文件路径 返回文件路径的数字组
try {
String editFilePath = busProcessModelHis.getEditFilePath();
File file = new File(editFilePath);
FileInputStream fileInputStream = new FileInputStream(file);
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(1024);
byte [] aByte = new byte[1024];
int n;
while ((n = fileInputStream.read(aByte)) != -1){
byteArrayOutputStream.write(aByte,0,n);
}
return busProcessModelHisList;
bytes = byteArrayOutputStream.toByteArray();
} catch (IOException e) {
e.printStackTrace();
}
onlineFileLog.setHisId(busProcessModelHis.getId());
onlineFileLog.setFilePath(busProcessModelHis.getEditFilePath());
if(StringUtils.isNotBlank(busProcessModelHis.getEditFilePath())){
String[] split = busProcessModelHis.getEditFilePath().split("/.");
onlineFileLog.setFileSuffix(split[1]);
}
if(StringUtils.isNotBlank(busProcessModelHis.getEditFilePath())){
String[] split = busProcessModelHis.getEditFilePath().split("/");
onlineFileLog.setOldFileName(split[2]);
}
}
return null;
return onlineFileLog;
}
/**
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1Before.java
+1
View File
@@ -23,6 +23,7 @@ public class ProcessStep1Before implements TaskListener {
if(!list.isEmpty()) {
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2Before.java
+1
View File
@@ -23,6 +23,7 @@ public class ProcessStep2Before implements TaskListener {
if(!list.isEmpty()) {
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3Before.java
+1
View File
@@ -23,6 +23,7 @@ public class ProcessStep3Before implements TaskListener {
if(!list.isEmpty()) {
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4Before.java
+1
View File
@@ -23,6 +23,7 @@ public class ProcessStep4Before implements TaskListener {
if(!list.isEmpty()) {
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5Before.java
+1
View File
@@ -23,6 +23,7 @@ public class ProcessStep5Before implements TaskListener {
if(!list.isEmpty()) {
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6Before.java
+1
View File
@@ -23,6 +23,7 @@ public class ProcessStep6Before implements TaskListener {
if(!list.isEmpty()) {
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep7Before.java
+1
View File
@@ -23,6 +23,7 @@ public class ProcessStep7Before implements TaskListener {
if(!list.isEmpty()) {
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2Before.java
+1
View File
@@ -26,6 +26,7 @@ public class Step2Before implements TaskListener {
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);