From d2f81732b0e509c59611318cc1fe9e4c3ad37c89 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Wed, 17 May 2023 11:29:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BA=9F=E6=AD=A2=E6=B5=81=E7=A8=8BOA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datas/controller/BusProcessModelHisController.java | 6 +++--- .../bat/wkflow/listener/aboliish/ProcessStep1Before.java | 1 + .../bat/wkflow/listener/aboliish/ProcessStep2Before.java | 1 + .../bat/wkflow/listener/aboliish/ProcessStep3Before.java | 1 + .../bat/wkflow/listener/aboliish/ProcessStep4Before.java | 1 + .../bat/wkflow/listener/aboliish/ProcessStep5Before.java | 1 + .../bat/wkflow/listener/aboliish/ProcessStep6Before.java | 1 + .../bat/wkflow/listener/aboliish/ProcessStep7Before.java | 1 + 8 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessModelHisController.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessModelHisController.java index 71e41e3b..750fe325 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessModelHisController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessModelHisController.java @@ -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 selectOnlineFile(@RequestParam("taskId") String taskId) { - List processModelHisList = busProcessModelHisService.selectOnlineFile(taskId); - return processModelHisList; + public OnlineFileLog selectOnlineFile(@RequestParam("onlineFileId") String onlineFileId) { + return busProcessModelHisService.selectOnlineFile(onlineFileId); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1Before.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1Before.java index 37855ba8..6684acd7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1Before.java @@ -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); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2Before.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2Before.java index a404b405..90ea9b3b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2Before.java @@ -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); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3Before.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3Before.java index 395809c4..33b352c6 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3Before.java @@ -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); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4Before.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4Before.java index c5be2640..62dde53d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4Before.java @@ -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); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5Before.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5Before.java index e13510f9..7e19662b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5Before.java @@ -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); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6Before.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6Before.java index 6d9ed849..b44c9519 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6Before.java @@ -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); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep7Before.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep7Before.java index d26702d5..d302bc87 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep7Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep7Before.java @@ -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); From a55d973467c64bc8a9dbab1807ad62a1cff0c0e9 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Wed, 17 May 2023 11:31:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=90=AC=E8=BF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datas/entity/OnlineFileLog.java | 51 +++++++++++++++++++ .../service/IBusProcessModelHisService.java | 3 +- .../impl/BusProcessModelHisServiceImpl.java | 49 +++++++++++------- 3 files changed, 84 insertions(+), 19 deletions(-) create mode 100644 src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/OnlineFileLog.java diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/OnlineFileLog.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/OnlineFileLog.java new file mode 100644 index 00000000..c82a3cc5 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/OnlineFileLog.java @@ -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; + +} diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessModelHisService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessModelHisService.java index b76bbdf4..37e7c7ae 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessModelHisService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessModelHisService.java @@ -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 void saveBussTemplateFile(JSONObject object, String pid); - List selectOnlineFile(String taskId); + OnlineFileLog selectOnlineFile(String onlineFileId); } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessModelHisServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessModelHisServiceImpl.java index b20c5240..e040d1ba 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessModelHisServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessModelHisServiceImpl.java @@ -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 selectOnlineFile(String taskId) { - QueryWrapper objectQueryWrapper = new QueryWrapper<>(); - objectQueryWrapper.eq("TASK_ID",taskId); - List busProcessModelHis = baseMapper.selectList(objectQueryWrapper); - if(!busProcessModelHis.isEmpty()){ - String pId = busProcessModelHis.get(0).getPId(); - QueryWrapper objectQueryWrapperPid = new QueryWrapper<>(); - objectQueryWrapperPid.eq("P_ID",pId); - List 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; } /** From 1442daae0641c6302ecfb3dfade92225cd3dcfb7 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Wed, 17 May 2023 14:48:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?OA=20=E5=88=B6=E4=BF=AE=E8=AE=A2=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E7=AB=8B=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2Before.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2Before.java b/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2Before.java index 38cbc367..ddb9369c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2Before.java @@ -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);