From 88748094ae17ca3b6423c54d307f0d5c40c8f420 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 02 八月 2025 14:44:13 +0800
Subject: [PATCH] 增加文件完整性校验
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java | 17 +++++++-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowProgramController.java | 2
blade-service/blade-mdm/src/test/java/org/springblade/mdm/flow/service/FlowProgramFileServiceTest.java | 9 ++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java | 38 +++++++++++++++++++
4 files changed, 62 insertions(+), 4 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
index c07110f..090b3b1 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
@@ -21,6 +21,7 @@
import org.springblade.mdm.flow.excution.StartDispatcher;
import org.springblade.mdm.flow.service.ApproveRecordService;
import org.springblade.mdm.flow.service.FlowCommonService;
+import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.program.entity.ProcessProgRef;
import org.springblade.mdm.program.service.ProcessProgRefService;
@@ -47,10 +48,12 @@
private final RuntimeService runtimeService;
private final ProcessProgRefService processProgRefService;
- private ApproveRecordService approveRecordService;
+ private final ApproveRecordService approveRecordService;
private final FlowCommonService flowCommonService;
+
+ private final FlowProgramFileService flowProgramFileService;
/**
- * 鏂板
+ * 鍙戣捣娲惧伐娴佺▼
*/
@PostMapping("/start")
@Operation(summary = "浠诲姟璁″垝(娲惧伐娴佺▼)", description = "鍚姩娲惧伐娴佺▼")
@@ -62,6 +65,14 @@
@Operation(summary = "瀹屾垚浠诲姟", description = "娴佸悜涓嬩竴涓妭鐐�")
@PostMapping("completeTask")
public R<Void> completeTask(String taskId, String processInstanceId, String comment,@Parameter(name = "variables", description = "浠诲姟鍙橀噺") @RequestBody Map<String, Object> variables) {
+
+ Task task = taskService.createTaskQuery()
+ .taskId(taskId)
+ .singleResult();
+ if(task.getTaskDefinitionKey().equals("programmingTask")) {//缂栧埗鑺傜偣
+ String operateResult = variables.get("approve")+"";
+ flowProgramFileService.checkProgramFiles(processInstanceId,"Y".equals(operateResult));
+ }
// 澧炲姞璇勮
if (StringUtil.isNoneBlank(processInstanceId, comment)) {
taskService.addComment(taskId, processInstanceId, comment);
@@ -76,6 +87,7 @@
runtimeService.setVariable(taskId, FlowContants.PROGRAM_IDS_KEY, programIds);
}
if(StringUtils.isNotEmpty(programIds)) {
+ //杩欏凡缁忔病鐢ㄤ簡锛岀洿鎺ヤ娇鐢ㄤ复鏃舵枃浠�
processProgRefService.addRelations(processInstanceId,Func.toLongList(programIds));
}
@@ -83,7 +95,6 @@
variables.put("approveUserNickName",AuthUtil.getNickName());
if(variables.containsKey("assignee")){
-
addApproveRecord(taskId,processInstanceId,comment,variables);
//鎸囧畾浜嗕笅涓�姝ユ墽琛屼汉
taskService.complete(taskId, variables);
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowProgramController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowProgramController.java
index 3c841b1..49ca95c 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowProgramController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowProgramController.java
@@ -51,7 +51,7 @@
@GetMapping("/nclist-by-instanceid")
@Operation(summary = "娴佺▼绋嬪簭鏂囦欢鍒楄〃", description = "娴佺▼绋嬪簭鏂囦欢鍒楄〃")
public R<List<FlowProgramFile>> listNcFileByProcess(@Parameter(description="娴佺▼瀹炰緥id")@RequestParam String processInstanceId) {
- return R.data(flowProgramFileService.lambdaQuery().eq(FlowProgramFile::getProcessInstanceId, processInstanceId).list());
+ return R.data(flowProgramFileService.lambdaQuery().eq(FlowProgramFile::getProcessInstanceId, processInstanceId).orderByAsc(FlowProgramFile::getCreateTime).list());
}
@PostMapping("/remove")
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java
index a6de868..085a2a3 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java
@@ -23,6 +23,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
+import java.util.List;
/**
* 娴佺▼绋嬪簭澶勭悊锛屽寘鎷笂浼狅紝鏌ヨ灞曠ず
@@ -169,5 +170,42 @@
return result;
}
+ /**
+ * 楠岃瘉绋嬪簭鏂囦欢鐨勫畬鏁存�э紝浠呭湪缂栧埗鑺傜偣浣跨敤
+ * @param processInstanceId 娴佺▼瀹炰緥id
+ */
+ public void checkProgramFiles(String processInstanceId,boolean isPass) {
+ List<FlowProgramFile> flowPrograms = this.lambdaQuery().eq(FlowProgramFile::getProcessInstanceId, processInstanceId).orderByAsc(FlowProgramFile::getCreateTime).list();
+ if(isPass && flowPrograms.isEmpty()){
+ throw new ServiceException("璇蜂笂浼犵▼搴忔枃浠�");
+ }
+ int totalSeg = 0;
+ if(!flowPrograms.isEmpty()){
+ FlowProgramFile progFile = flowPrograms.get(0);
+ totalSeg = getProgramSegCount(progFile.getName());
+ }
+ if(totalSeg != flowPrograms.size()){
+ throw new ServiceException("搴斾笂浼�"+totalSeg+"娈电▼搴忥紝瀹為檯涓婁紶"+flowPrograms.size()+"娈�");
+ }
+
+ }
+
+ /**
+ * 鏍规嵁鏂囦欢鍚嶈幏鍙栫▼搴忔�绘鏍�
+ * @param filename 鏂囦欢鍚�
+ * @return
+ */
+ int getProgramSegCount(String filename){
+ int idx = filename.lastIndexOf(".");
+ String tempstr = filename.substring(0,idx);//鍘绘帀鎵╁睍鍚�
+ //System.out.println(tempstr);
+ idx = tempstr.lastIndexOf("-");
+ tempstr = tempstr.substring(0,idx);
+ //System.out.println(tempstr);
+ idx = tempstr.lastIndexOf("-");
+ tempstr = tempstr.substring(idx+1);
+ //System.out.println(tempstr);
+ return Func.toInt(tempstr);
+ }
}
diff --git a/blade-service/blade-mdm/src/test/java/org/springblade/mdm/flow/service/FlowProgramFileServiceTest.java b/blade-service/blade-mdm/src/test/java/org/springblade/mdm/flow/service/FlowProgramFileServiceTest.java
index 2cfe108..bc6afe5 100644
--- a/blade-service/blade-mdm/src/test/java/org/springblade/mdm/flow/service/FlowProgramFileServiceTest.java
+++ b/blade-service/blade-mdm/src/test/java/org/springblade/mdm/flow/service/FlowProgramFileServiceTest.java
@@ -49,4 +49,13 @@
Assertions.assertEquals(4,e.getResultCode().getCode());
}
}
+
+
+ @Test
+ public void getProgramSegCount(){
+ FlowProgramFileService service = new FlowProgramFileService();
+ String filename = "YZL4-1100-01-50-A-5-1.TXT";
+
+ Assertions.assertEquals(5, service.getProgramSegCount(filename));
+ }
}
--
Gitblit v1.9.3