From ddafa0375398053baaafdee8612f68c1b75ff7cb Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 22 八月 2025 13:37:54 +0800
Subject: [PATCH] 机床导入1
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java | 91 ++++++---------------------------------------
1 files changed, 13 insertions(+), 78 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java
index 9cb255f..85b4b00 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java
@@ -1,99 +1,34 @@
+
package org.springblade.mdm.program.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.oss.OssTemplate;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.mdm.flow.service.CureFlowService;
import org.springblade.mdm.program.entity.DncBackFile;
-import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.mapper.DncBackFileMapper;
import org.springblade.mdm.program.vo.DncBackFileQueryVO;
import org.springblade.mdm.program.vo.DncBackFileVO;
-import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
-import java.util.List;
-
-@AllArgsConstructor
+/**
+ * DNC鍥炰紶鏂囦欢澶勭悊鏈嶅姟
+ *
+ * @author yangys
+ */
+@Slf4j
@Service
+@AllArgsConstructor
public class DncBackFileService extends BizServiceImpl<DncBackFileMapper, DncBackFile> {
- private final NcProgramService progService;
+ private final NcNodeService ncNodeService;
private final OssTemplate ossTemplate;
- private final CureFlowService cureFlowService;
- /**
- * 鎺ュ彈
- * @param ids
- */
- public void accept(String ids) {
- List<Long> idList = Func.toLongList(ids);
-
- for(Long id : idList){
- DncBackFile backFile = this.getById(id);
- backFile.setStatus(DncBackFile.STATUS_ACCEPTED);
- backFile.setConfirmTime(DateUtil.now());
- this.updateById(backFile);
-
- //鏂板缓涓�涓▼搴忥紝灏嗚�佺殑绋嬪簭isLastEditon璁剧疆鏈�0锛岀劧鍚庡惎鍔ㄦ祦绋�
- this.upgradeProgramAndStartCure(backFile.getNcProgramId(),backFile);
- }
- }
-
- void upgradeProgramAndStartCure(long ncProgramId,DncBackFile backFile) {
- NcProgram oldProgram = this.progService.getById(ncProgramId);
- //鏇存柊鏂囦欢淇℃伅
- oldProgram.setOssName(backFile.getOssName());
- oldProgram.setUrl(backFile.getUrl());
- //TODO锛屾槸鍚﹀垹闄ゅ師鏉ョ殑鏂囦欢锛�
- progService.updateById(oldProgram);
- /*
- NcProgram newProgram = new NcProgram();
- BeanUtils.copyProperties(oldProgram,newProgram);
-
- oldProgram.setIsLastEdition(0);
- progService.updateById(oldProgram);
-
- newProgram.setId(null);
- newProgram.setIsLastEdition(1);
- progService.updateById(newProgram);
-
- */
-
- cureFlowService.startOne(oldProgram);//鍚姩涓�涓▼搴忕殑鍥哄寲娴佺▼
- }
-
- /**
- * 鎷掔粷
- * @param ids
- */
- public void reject(String ids) {
- List<Long> idList = Func.toLongList(ids);
-
- for(Long id : idList){
- DncBackFile backFile = this.getById(id);
- backFile.setStatus(DncBackFile.STATUS_REJECTED);
- backFile.setConfirmTime(DateUtil.now());
- this.ossTemplate.removeFile(backFile.getOssName());
- this.updateById(backFile);
- }
-
- }
-
- /**
- * DNC鍥炰紶绋嬪簭澶勭悊鍒嗛〉鏌ヨ
- * @param query 鏌ヨ鍙傛暟
- * @return 鍒嗛〉鏁版嵁
- */
public IPage<DncBackFileVO> pageQuery(DncBackFileQueryVO query) {
- /*
- IPage<DncBackFileVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query),query);
- */
- return this.getBaseMapper().pageQuery(Condition.getPage(query),query);
+ return this.baseMapper.pageQuery(Condition.getPage(query),query);
}
-
}
--
Gitblit v1.9.3