From cf7234b1fc2c5827fdb126ba2f7db2456f2c1da6 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 30 六月 2025 19:16:20 +0800
Subject: [PATCH] 修改字段错误
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramUploadVO.java | 2
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java | 6 +-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProgramSeqMapper.xml | 9 ++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java | 16 ++++++++
blade-service/blade-mdm/pom.xml | 5 ++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/ProgramSeq.java | 17 ++++++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProgramSeqMapper.java | 9 ++++
7 files changed, 60 insertions(+), 4 deletions(-)
diff --git a/blade-service/blade-mdm/pom.xml b/blade-service/blade-mdm/pom.xml
index a5cf71e..5e025cd 100644
--- a/blade-service/blade-mdm/pom.xml
+++ b/blade-service/blade-mdm/pom.xml
@@ -75,6 +75,11 @@
<artifactId>tika-core</artifactId>
<version>3.2.0</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-devtools</artifactId>
+ <optional>true</optional>
+ </dependency>
<!--<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-starter-transaction</artifactId>
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java
index 2edda0f..c59200a 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java
@@ -76,15 +76,15 @@
/**
* 鏄惁鏈�鏂扮増娆★紝1锛氭渶鏂扮増娆★紱0:鍘嗗彶鐗堟
*/
- private Integer isLastEdition;
+ private Integer isLastEdition = 1;
/**
* 鏄惁閿佸畾
*/
- private Integer isLocked;
+ private Integer isLocked = 0;
/**
* 鏄惁娴嬭瘯绋嬪簭
*/
- private Integer isTest;
+ private Integer isTest = 0;
/**
* 浠诲姟鍒嗘淳鏃堕棿
*/
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/ProgramSeq.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/ProgramSeq.java
new file mode 100644
index 0000000..14b5d81
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/ProgramSeq.java
@@ -0,0 +1,17 @@
+package org.springblade.mdm.program.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+import org.springblade.core.mp.base.BizEntity;
+
+import java.time.LocalDate;
+import java.util.Date;
+
+@Setter
+@Getter
+@TableName("mdm_program_seq")
+public class ProgramSeq {
+ private long id;
+ private Date createTime;
+}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProgramSeqMapper.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProgramSeqMapper.java
new file mode 100644
index 0000000..3a69792
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProgramSeqMapper.java
@@ -0,0 +1,9 @@
+package org.springblade.mdm.program.mapper;
+
+import org.springblade.mdm.program.entity.ProgramSeq;
+
+import java.util.List;
+
+public interface ProgramSeqMapper{
+ void insert(ProgramSeq entity);
+}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProgramSeqMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProgramSeqMapper.xml
new file mode 100644
index 0000000..4bee586
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProgramSeqMapper.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.mdm.program.mapper.ProgramSeqMapper">
+
+ <insert id="insert" useGeneratedKeys="true" keyProperty="id">
+ INSERT INTO mdm_program_seq(create_time)
+ VALUES(current_time)
+ </insert>
+</mapper>
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 5dc2482..0429718 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
@@ -37,8 +37,10 @@
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.program.entity.NcNode;
+import org.springblade.mdm.program.entity.ProgramSeq;
import org.springblade.mdm.program.mapper.NcProgramMapper;
import org.springblade.mdm.program.entity.NcProgram;
+import org.springblade.mdm.program.mapper.ProgramSeqMapper;
import org.springblade.mdm.program.vo.DncSendBackData;
import org.springblade.mdm.program.vo.NcProgramUploadVO;
import org.springblade.mdm.program.vo.NcProgramVO;
@@ -50,6 +52,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
+import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;
@@ -67,6 +70,8 @@
private final OssTemplate ossTemplate;
private final NcNodeService nodeService;
+
+ private final ProgramSeqMapper seqMapper;
/**
* 鏌ヨ鐜版湁鍥哄寲鐨勭▼搴忥紝鏆傚畾鏉′欢锛氶浂缁勪欢鍙风浉鍚岋紝涓旀槸鍚屼竴鏈哄簥缁�
* @param partNo
@@ -84,16 +89,20 @@
* @param uploadVO 涓婁紶鏂囦欢琛ㄥ崟鏁版嵁
*/
public void uploadProgramFile(NcProgramUploadVO uploadVO) {
+
+
MultipartFile file = uploadVO.getFile();
BladeFile bfile = ossTemplate.putFile(uploadVO.getFile());
String link = bfile.getLink();
//淇濆瓨profame
NcProgram prog = new NcProgram();
+ prog.setCode(generageCode());
prog.setName(file.getOriginalFilename());
prog.setNcNodeId(uploadVO.getNodeId());
prog.setOssName(bfile.getName());
prog.setPartNo(uploadVO.getPartNo());
prog.setProcessEdition(uploadVO.getProcessEdition());
+ prog.setIsLastEdition(1);
boolean isTextFile = false;
try {
isTextFile = FileContentUtil.isTextFile(file.getInputStream());
@@ -107,6 +116,13 @@
this.save(prog);
}
+ String generageCode(){
+ ProgramSeq program = new ProgramSeq();
+ seqMapper.insert(program);
+
+ DecimalFormat df = new DecimalFormat("0000000000");
+ return df.format(program.getId());
+ }
/**
* 鍒犻櫎涓�涓▼搴�
* @param id
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramUploadVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramUploadVO.java
index 04d6def..dacd3a7 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramUploadVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramUploadVO.java
@@ -11,7 +11,7 @@
*/
@Setter
@Getter
-public class NcProgramUploadVO extends BaseVO {
+public class NcProgramUploadVO {
@Schema(description = "鎵�灞炶妭鐐筰d")
private Long nodeId;
--
Gitblit v1.9.3