From 143e74027f8b68fb7fa4dcd0026ccfa1e0e16788 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 10 九月 2025 16:41:45 +0800
Subject: [PATCH] mes接口调整
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java | 100 +++++++++----------------------------------------
1 files changed, 19 insertions(+), 81 deletions(-)
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..dfe1fef 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
@@ -28,25 +28,21 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
-import org.flowable.engine.*;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.oss.OssTemplate;
import org.springblade.core.oss.model.BladeFile;
-import org.springblade.mdm.basesetting.machine.MachineService;
+import org.springblade.mdm.basesetting.machine.service.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.NcNodeProgramQueryVO;
import org.springblade.mdm.program.vo.NcProgramUploadVO;
import org.springblade.mdm.program.vo.NcProgramVO;
@@ -58,7 +54,6 @@
import java.io.File;
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;
@@ -87,38 +82,6 @@
public List<NcProgram> getCuredNcProgram(String drwaingNo,String machineCode) {
Machine machine = machineService.getByCode(machineCode);
return this.getBaseMapper().getCuredNcProgram(drwaingNo,machine.getMachineGroupCode());
- }
-
-
- /**
- * 涓婁紶绋嬪簭鏂囦欢鍒版寚瀹氳妭鐐�
- * @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.setDrawingNo(uploadVO.getDrawingNo());
- prog.setProcessEdition(uploadVO.getProcessEdition());
- prog.setIsLastEdition(1);
- boolean isTextFile = false;
- try {
- isTextFile = FileContentUtil.isTextFile(file.getInputStream());
- } catch (IOException e) {
- log.warn("鍒ゆ柇鏄惁鏂囨湰鏂囦欢寮傚父",e);
- }
- prog.setIsTextFile(isTextFile);
- prog.setUrl(link);
- prog.setCategory(uploadVO.getCategory());
-
- this.save(prog);
}
/**
@@ -176,50 +139,7 @@
DecimalFormat df = new DecimalFormat("0000000000");
return df.format(program.getId());
}
- /**
- * 鍒犻櫎涓�涓▼搴�
- * @param id 绋嬪簭id
- */
- public String getFileContent(Long id) {
- String result ="";
- NcProgram prog = this.getById(id);
- if(prog.getIsTextFile()!=null && prog.getIsTextFile()){
- String fileName = prog.getOssName();
- try (InputStream inputStream = ossTemplate.statFileStream(fileName)) {
- result = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }else{
- result = "闈炴枃鏈牸寮忔枃浠�";
- }
- return result;
- }
-
- /**
- * 鑾峰彇鏂囦欢鍐呴タ鍝﹂偅涓�
- * @param ncNodeId 鑺傜偣id
- */
- public String getFileContentByNodeId(Long ncNodeId) {
- String result ="";
- NcNode node = this.nodeService.getById(ncNodeId);
- LambdaQueryWrapper<NcProgram> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(NcProgram::getBindNcNodeId, ncNodeId);
- wrapper.eq(NcProgram::getIsLastEdition,1);
- NcProgram prog = this.getOne(wrapper);
- if(prog.getIsTextFile()!=null && prog.getIsTextFile()){
- String fileName = prog.getOssName();
- try (InputStream inputStream = ossTemplate.statFileStream(fileName)) {
- result = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }else{
- result = "闈炴枃鏈牸寮忔枃浠�";
- }
- return result;
- }
/**
* 鍒犻櫎涓�涓▼搴�
* @param id
@@ -364,4 +284,22 @@
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();
+ }*/
}
--
Gitblit v1.9.3