From 4852d6c95e98ef9390d9cbebce97c1bb7fcb04ad Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 16 七月 2025 23:37:58 +0800
Subject: [PATCH] 机床回传文件调整
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/filewatch/MachineFileBackListener.java | 3 +++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java | 2 +-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/entity/MachineBackFile.java | 3 +--
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/filewatch/DynamicDirectoryWatcher.java | 1 +
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.xml | 12 +++++++-----
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java | 1 +
6 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java
index 5c96e08..df099c5 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java
@@ -39,7 +39,7 @@
*/
@Operation(summary = "鎺ユ敹", description = "鎺ユ敹鏂囦欢")
@PostMapping("/accept")
- public R<Void> accept(String ids) {
+ public R<Void> accept(@RequestParam String ids) {
service.accept(ids);
return R.success();
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/entity/MachineBackFile.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/entity/MachineBackFile.java
index 8dd1e71..bb2fc8b 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/entity/MachineBackFile.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/entity/MachineBackFile.java
@@ -15,9 +15,8 @@
@TableName("mdm_machine_back_file")
public class MachineBackFile extends BizEntity {
public static int STATUS_ACCEPTED = 2;
- public static int STATUS_REJECTED = 2;
+ public static int STATUS_REJECTED = 3;
- private String programId;
private Long ncProgramId;
/**
* 纭鏃堕棿
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/filewatch/DynamicDirectoryWatcher.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/filewatch/DynamicDirectoryWatcher.java
index ad8e1df..82ca83d 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/filewatch/DynamicDirectoryWatcher.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/filewatch/DynamicDirectoryWatcher.java
@@ -4,6 +4,7 @@
import java.nio.file.Path;
import java.util.Set;
+
@Service
public class DynamicDirectoryWatcher {
private final FileWatcherService fileWatcherService;
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/filewatch/MachineFileBackListener.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/filewatch/MachineFileBackListener.java
index 8ca6944..992ac84 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/filewatch/MachineFileBackListener.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/filewatch/MachineFileBackListener.java
@@ -44,9 +44,12 @@
log.warn("鏂囦欢浼犺緭涓紝鍚庣画鍐嶆搷浣渰}",filePath);
}
} catch (IOException e) {
+ log.error("鍥炰紶鏂囦欢鎿嶄綔IO閿欒",e);
throw new RuntimeException(e);
} catch (InterruptedException e) {
log.error("sleep鍑洪敊");
+ } catch (Exception e) {
+ log.error("鏈哄簥鍥炰紶鏂囦欢澶勭悊寮傚父",e);
}
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.xml
index a418734..c560391 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.xml
@@ -12,9 +12,10 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
<select id="pageQuery" resultType="org.springblade.mdm.machineback.vo.MachineBackFileVO">
- select f.id,p.name program_name,p.is_cured,f.create_time,m.code machine_code, m.name machine_name,f.create_time arrived_time
- from mdm_machine_back_file f join mdm_machine m on f.machine_code=m.code
- left join mdm_nc_program p on f.program_id=p.id
+ select f.id,p.name name,p.is_cured,f.create_time,m.code machine_code, m.name machine_name,f.create_time arrived_time
+ from mdm_machine_back_file f
+ left join mdm_nc_program p on f.nc_program_id=p.id
+ join mdm_machine m on p.machine_code=m.code
<where>
f.status=1 and f.is_deleted=0
@@ -32,8 +33,9 @@
<!--鏈哄簥鍥炰紶绋嬪簭澶勭悊鍒嗛〉-->
<select id="handlePageQuery" resultType="org.springblade.mdm.machineback.vo.MachineBackFileVO">
select f.id,p.name name,p.code,p.is_cured,f.create_time,m.code machine_code, m.name machine_name,f.create_time arrived_time
- from mdm_machine_back_file f join mdm_machine m on f.machine_code=m.code
- left join mdm_nc_program p on f.program_id=p.id
+ from mdm_machine_back_file f
+ left join mdm_nc_program p on f.nc_program_id=p.id
+ left join mdm_machine m on p.machine_code=m.code
<where>
f.status=2 and f.is_deleted=0
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java
index f9fdce0..ba63182 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java
@@ -249,6 +249,7 @@
prog.setIsLastEdition(jsonObject.getInteger("isLastEdition"));
prog.setIsLocked(jsonObject.getInteger("isLocked"));
prog.setIsTest(jsonObject.getInteger("isTest"));
+ prog.setIsTextFile(jsonObject.getBoolean("isTextFile"));
prog.setMachineCode(jsonObject.getString("machineCode"));
prog.setNcNodeId(jsonObject.getLong("ncNodeId"));
prog.setDrawingNo(jsonObject.getString("drawingNo"));
--
Gitblit v1.9.3