From d9919b8e236113a1451082943ce889a6eb1f9495 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 20 七月 2025 10:54:41 +0800
Subject: [PATCH] 上传接口调整
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java | 6 +++
doc/sql/mdm/mdm.mysql.all.create.sql | 73 +++++++++++++++++++++++++-----------
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java | 17 ++++++++
3 files changed, 73 insertions(+), 23 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java
index b08d919..0757e57 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java
@@ -141,6 +141,12 @@
return R.data(approveRecordService.listByNcProgramId(ncProgramId));
}
+
+ @GetMapping("/history-by-bindnodeid")
+ @Operation(summary = "鏍规嵁缁戝畾鑺傜偣id鑾峰彇鍘嗗彶鍒楄〃", description = "绋嬪簭鍘嗗彶鍒楄〃锛屼粎鈥樼▼搴忓寘鈥欏瓧鍏稿��70鐨勬暟鎹�傜敤浜庢樉绀虹▼搴忕殑鈥樺巻鍙茬増鏈��")
+ public R<List<NcProgramVO>> historyByBindNodeId(@Parameter(description="鑺傜偣ID(nodeType=70鐨勮妭鐐筰d)")@RequestParam Long bindNodeId) {
+ return R.data(ncProgramService.historyByBindNode(bindNodeId));
+ }
/*
@PostMapping("/send")
@Operation(summary = "绋嬪簭涓嬪彂", description = "宸ユ帶缃戞暟鎺х▼搴忎笅鍙戯紙鍙戦�佸埌鏈哄簥閰嶇疆鐨勪笅鍙戠洰褰曪級,鏍规嵁id")
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
index 4c76756..eb4769a 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
@@ -364,4 +364,21 @@
return this.count(wrapper)>0;
}
+
+ /**
+ * 鏄剧ず绋嬪簭鐨勫巻鍙茶褰曞垪琛�
+ * @param bindNodeId
+ * @return
+ */
+ public List<NcProgramVO> historyByBindNode(Long bindNodeId) {
+
+ NcProgram program = this.getByBindNodeId(bindNodeId);
+ List<NcProgram> list = this.lambdaQuery().eq(NcProgram::getName,program.getName())
+ .eq(NcProgram::getNcNodeId,program.getNcNodeId()).orderByDesc(NcProgram::getCreateTime).list();
+
+ return list.stream().map(p -> {
+ NcProgramVO vo = new NcProgramVO();
+ BeanUtils.copyProperties(p,vo);
+ return vo;}).toList();
+ }
}
diff --git a/doc/sql/mdm/mdm.mysql.all.create.sql b/doc/sql/mdm/mdm.mysql.all.create.sql
index 7aee6aa..5ebce10 100644
--- a/doc/sql/mdm/mdm.mysql.all.create.sql
+++ b/doc/sql/mdm/mdm.mysql.all.create.sql
@@ -89,24 +89,6 @@
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='绋嬪簭鑺傜偣鐩綍';
-/**娴佺▼瀹炰緥涓庤妭鐐瑰叧鑱旇〃锛岃褰曞垱寤烘椂鏈猴細鐢ㄦ埛鍦ㄧ▼搴忕紪鍒惰妭鐐规墜鍔ㄥ叧鑱�*/
-DROP TABLE IF EXISTS `mdm_process_prog_ref`;
-CREATE TABLE `mdm_process_prog_ref` (
- `id` bigint NOT NULL,
- `tenant_id` varchar(6) DEFAULT NULL COMMENT '鎵�灞炵鎴�',
- `process_instance_id` varchar(64) NOT NULL COMMENT '娴佺▼瀹炰緥id',
- `nc_program_id` bigint DEFAULT NULL COMMENT '鏁版帶绋嬪簭id',
- `process_definition_key` varchar(100) DEFAULT NULL COMMENT '娴佺▼瀹氫箟key',
- `status` int DEFAULT NULL COMMENT '涓氬姟鐘舵��',
- `create_dept` bigint DEFAULT NULL COMMENT '鍒涘缓鍗曚綅',
- `is_deleted` int DEFAULT NULL,
- `create_time` datetime DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
- `create_user` bigint DEFAULT NULL COMMENT '鍒涘缓浜�',
- `update_time` datetime DEFAULT NULL COMMENT '鏇存柊鏃堕棿',
- `update_user` bigint DEFAULT NULL COMMENT '鏇存柊浜�',
- PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='娴佺▼瀹炰緥涓庣▼搴忓叧鑱旇〃';
-
DROP TABLE IF EXISTS `mdm_nc_program`;
CREATE TABLE `mdm_nc_program` (
`id` bigint NOT NULL,
@@ -132,6 +114,7 @@
`is_last_edition` int NOT NULL COMMENT '鏄惁鏈�鏂扮増娆★紝1锛氭渶鏂扮増娆★紱0:鍘嗗彶鐗堟锛屼富瑕佸彇璇ュ瓧娈�=1鐨勬暟鎹紝0鏄巻鍙茬増娆�',
`is_locked` int DEFAULT NULL COMMENT '閿佸畾鐘舵�侊紝1锛氶攣瀹氾紱0:姝ｅ父',
`is_test` int DEFAULT NULL COMMENT '鏄惁娴嬭瘯绋嬪簭锛�1锛氭槸锛�0:鍚�',
+ `version_number` int DEFAULT NULL COMMENT '鐗堟湰鍙�',
`task_assign_time` datetime DEFAULT NULL COMMENT '绋嬪簭鐨勪换鍔′笅鍙戠殑鏃堕棿锛堢敤浜庢鏌ユ槸鍚︿负閲嶅鐨勪换鍔★級',
`status` int DEFAULT NULL COMMENT '涓氬姟鐘舵��',
`create_dept` bigint DEFAULT NULL COMMENT '鍒涘缓鍗曚綅',
@@ -142,6 +125,25 @@
`update_user` bigint DEFAULT NULL COMMENT '鏇存柊浜�',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='鏁版帶绋嬪簭';
+
+
+/**娴佺▼瀹炰緥涓庢暟鎺х▼搴忓叧鑱旇〃锛岃褰曞垱寤烘椂鏈猴細鐢ㄦ埛鍦ㄧ▼搴忕紪鍒惰妭鐐规墜鍔ㄥ叧鑱�*/
+DROP TABLE IF EXISTS `mdm_process_prog_ref`;
+CREATE TABLE `mdm_process_prog_ref` (
+ `id` bigint NOT NULL,
+ `tenant_id` varchar(6) DEFAULT NULL COMMENT '鎵�灞炵鎴�',
+ `process_instance_id` varchar(64) NOT NULL COMMENT '娴佺▼瀹炰緥id',
+ `nc_program_id` bigint DEFAULT NULL COMMENT '鏁版帶绋嬪簭id',
+ `process_definition_key` varchar(100) DEFAULT NULL COMMENT '娴佺▼瀹氫箟key',
+ `status` int DEFAULT NULL COMMENT '涓氬姟鐘舵��',
+ `create_dept` bigint DEFAULT NULL COMMENT '鍒涘缓鍗曚綅',
+ `is_deleted` int DEFAULT NULL,
+ `create_time` datetime DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
+ `create_user` bigint DEFAULT NULL COMMENT '鍒涘缓浜�',
+ `update_time` datetime DEFAULT NULL COMMENT '鏇存柊鏃堕棿',
+ `update_user` bigint DEFAULT NULL COMMENT '鏇存柊浜�',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='娴佺▼瀹炰緥涓庣▼搴忓叧鑱旇〃';
/**
娴佺▼瀹℃壒璁板綍琛紝瀹℃壒杩囩▼涓褰�
@@ -204,16 +206,13 @@
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='鏁版帶绋嬪簭浜ゆ崲璁板綍';
-
-
DROP TABLE IF EXISTS `mdm_machine_back_file`;
CREATE TABLE `mdm_machine_back_file` (
`id` bigint NOT NULL,
`tenant_id` varchar(6) DEFAULT NULL COMMENT '鎵�灞炵鎴�',
- `program_id` bigint NOT NULL COMMENT '绋嬪簭缂栫爜',
- `machine_code` varchar(100) DEFAULT NULL COMMENT '鎵�灞炴満搴婁唬鐮�',
+ `nc_program_id` bigint NOT NULL COMMENT '绋嬪簭缂栫爜',
`confirm_time` datetime DEFAULT NULL COMMENT '纭鏃堕棿',
-
+ `oss_name` varchar(100) NULL COMMENT 'oss涓殑鏂囦欢鍚�',
`status` int DEFAULT NULL COMMENT '涓氬姟鐘舵��',
`create_dept` bigint DEFAULT NULL COMMENT '鍒涘缓鍗曚綅',
`is_deleted` int DEFAULT NULL,
@@ -226,3 +225,31 @@
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='鏈哄簥鍥炰紶鏂囦欢';
+DROP TABLE IF EXISTS `mdm_dnc_back_file`;
+CREATE TABLE `mdm_dnc_back_file` (
+ `id` bigint NOT NULL,
+ `tenant_id` varchar(6) DEFAULT NULL COMMENT '鎵�灞炵鎴�',
+ `nc_program_id` bigint NOT NULL COMMENT '绋嬪簭缂栫爜',
+ `confirm_time` datetime DEFAULT NULL COMMENT '纭鏃堕棿',
+ `oss_name` varchar(100) NULL COMMENT 'oss涓殑鏂囦欢鍚�',
+ `url` varchar(400) NOT NULL COMMENT '鏂囦欢鍦板潃',
+ `status` int DEFAULT NULL COMMENT '涓氬姟鐘舵��',
+ `create_dept` bigint DEFAULT NULL COMMENT '鍒涘缓鍗曚綅',
+ `is_deleted` int DEFAULT NULL,
+
+ `create_time` datetime DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
+ `create_user` bigint DEFAULT NULL COMMENT '鍒涘缓浜�',
+ `update_time` datetime DEFAULT NULL COMMENT '鏇存柊鏃堕棿',
+ `update_user` bigint DEFAULT NULL COMMENT '鏇存柊浜�',
+ PRIMARY KEY (`id`) USING BTREE
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='鏈哄簥鍥炰紶鏂囦欢';
+
+
+DROP TABLE IF EXISTS `mdm_file_locks`;
+CREATE TABLE `mdm_file_locks` (
+ `lock_id` int NOT NULL COMMENT '閿佸畾id锛屽浐瀹�1',
+ `locked_by` varchar(100) DEFAULT NULL COMMENT '閿佸畾id',
+ `lock_time` datetime DEFAULT NULL COMMENT '閿佸畾鏃堕棿',
+ PRIMARY KEY (`lock_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='鏂囦欢鐩戞帶閿佸畾琛�';
--
Gitblit v1.9.3