From 2f7738d809f1b3e31ec61e97c7be974beda3be30 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 12 八月 2025 16:27:00 +0800
Subject: [PATCH] 新增文件编辑和保存接口
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/controller/MachineFileController.java | 14 +++++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/task/MachineFileScanTask.java | 49 ++++++++++++++++++++++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProgramFlowStatusQueryService.java | 22 ----------
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/service/MachineBackFileService.java | 2 -
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/Machine.java | 5 ++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java | 3 -
6 files changed, 70 insertions(+), 25 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/Machine.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/Machine.java
index 6fdee96..a06fbd5 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/Machine.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/Machine.java
@@ -56,6 +56,11 @@
* 绋嬪簭鍥炰紶鐩綍',
*/
private String progReceiveDir;
+
+ /**
+ * 绋嬪簭闀挎湡瀛樺偍鐩綍
+ */
+ private String progTempDir;
/**
* 澶囨敞
*/
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/controller/MachineFileController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/controller/MachineFileController.java
index 9ba1f2e..8c67fd9 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/controller/MachineFileController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/controller/MachineFileController.java
@@ -15,6 +15,7 @@
import org.springblade.mdm.gkw.programnode.vo.MachineFileQueryVO;
import org.springblade.mdm.gkw.programnode.vo.ProgramNodeVO;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -44,4 +45,17 @@
return R.data(pageData);
}
+
+ @GetMapping("/file-content")
+ @Operation(summary = "鑾峰彇鏈哄簥鐩綍鏂囦欢鍐呭", description = "宸ユ帶缃戠洰褰曟枃浠跺垪琛�")
+ public R<String> machineFileContent(Long id) {
+ return R.data("涓存椂鍐呭");
+ }
+
+ @PostMapping("/file-save")
+ @Operation(summary = "鑾峰彇鏂囦欢鍐呭", description = "宸ユ帶缃戠洰褰曟枃浠跺垪琛�")
+ public R<Void> machineFileSave(Long id,String content) {
+ return R.success();
+ }
+
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/service/MachineBackFileService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/service/MachineBackFileService.java
index 30c0d97..861a3db 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/service/MachineBackFileService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/service/MachineBackFileService.java
@@ -39,7 +39,6 @@
backFile.setConfirmTime(DateUtil.now());
this.updateById(backFile);
-
}
}
@@ -67,7 +66,6 @@
*/
public IPage<MachineBackFileVO> pageQuery(MachineBackFileQueryVO query) {
IPage<MachineBackFileVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query),query);
-
return page;
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
index 3e55ae1..e0eb14f 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
@@ -73,11 +73,10 @@
List<NcNodeVO> list = ncNodeService.lazyList(parentId);
if(list != null && !list.isEmpty()) {
for(NcNodeVO ncNodeVO : list) {
- if(!"60".equals(ncNodeVO.getNodeType())){
+ if(!NcNode.TYPE_PROGRAM_PACKAGE.equals(ncNodeVO.getNodeType())){
break;
}
ncNodeVO.setFlowStatus(programFlowStatusQueryService.queryFlowStatus(ncNodeVO.getProcessInstanceId()));
-
}
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProgramFlowStatusQueryService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProgramFlowStatusQueryService.java
index 064ac45..10d2abd 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProgramFlowStatusQueryService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProgramFlowStatusQueryService.java
@@ -4,20 +4,8 @@
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.HistoryService;
-import org.flowable.engine.RuntimeService;
import org.flowable.engine.history.HistoricProcessInstance;
-import org.springblade.core.mp.base.BizServiceImpl;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.mdm.flow.entity.ApproveRecord;
-import org.springblade.mdm.flow.service.ApproveRecordService;
-import org.springblade.mdm.program.entity.NcNode;
-import org.springblade.mdm.program.mapper.NcNodeMapper;
-import org.springblade.mdm.program.vo.NcNodeVO;
-import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
-
-import java.util.List;
-
/**
* 绋嬪簭鑺傜偣
*
@@ -27,20 +15,12 @@
@Service
@AllArgsConstructor
public class ProgramFlowStatusQueryService {
- private final RuntimeService runtimeService;
-
- private final ApproveRecordService approveRecordService;
private final HistoryService historyService;
public int queryFlowStatus(String processInstanceId) {
-
- //List<ApproveRecord> records = approveRecordService.lambdaQuery().eq(ApproveRecord::getNcProgramId, ncPogramId).orderByDesc(ApproveRecord::getCreateTime).last("limit 1").list();
-
if(processInstanceId == null){
return 0;
}
- //String processInstanceId = records.get(0).getProcessInstanceId();
-
- int status = 0;
+ int status;
HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
.processInstanceId(processInstanceId)
.singleResult();
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/task/MachineFileScanTask.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/task/MachineFileScanTask.java
new file mode 100644
index 0000000..66ab867
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/task/MachineFileScanTask.java
@@ -0,0 +1,49 @@
+package org.springblade.mdm.task;
+
+import org.springblade.core.tool.utils.FileUtil;
+import org.springblade.mdm.basesetting.machine.MachineService;
+import org.springblade.mdm.basesetting.machine.entity.Machine;
+import org.springblade.mdm.gkw.programnode.entity.MachineFile;
+import org.springblade.mdm.gkw.programnode.service.MachineFileService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+import java.util.List;
+
+@Component
+@EnableScheduling
+public class MachineFileScanTask {
+ @Autowired
+ private MachineFileService machineFileService;
+ @Autowired
+ private MachineService machineService;
+ // 姣�5绉掓墽琛屼竴娆�
+ @Scheduled(fixedRate = 1000000)
+ //@Scheduled(cron = "0 1 0 * * ?") // 姣忓ぉ涓婂崍0鐐�1鍒嗘墽琛�
+ public void executeEvery5Seconds() {
+ System.out.println("瀹氭椂浠诲姟鎵ц: " + System.currentTimeMillis());
+ }
+
+
+ public void scanMachineFile() {
+ List<Machine> machines = machineService.lambdaQuery().eq(Machine::getStatus,Machine.STATUS_ENABLE).list();
+ for (Machine machine : machines) {
+
+ }
+
+ }
+
+ void scanReceiveDir(Machine machine){
+ List<File> files = FileUtil.list(machine.getProgReceiveDir());
+
+
+ for(File f : files){
+ MachineFile mf = new MachineFile();
+ mf.setName(f.getName());
+ mf.setDirType(MachineFile.DIR_TYPE_REC);
+ }
+ }
+}
--
Gitblit v1.9.3