From f26051cf29997af1a0c0862f583ea477163ab77e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 13 八月 2025 14:19:09 +0800
Subject: [PATCH] 代码格式整理；机床回传文件
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/service/MachineBackFileService.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/service/MachineBackFileService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/service/MachineBackFileService.java
index 2019645..343b7fc 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/service/MachineBackFileService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/service/MachineBackFileService.java
@@ -2,24 +2,31 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import jakarta.servlet.ServletOutputStream;
+import lombok.AllArgsConstructor;
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.basesetting.machine.vo.MachineQueryVO;
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
+import org.springblade.mdm.gkw.programnode.entity.MachineFile;
+import org.springblade.mdm.gkw.programnode.service.MachineFileService;
import org.springblade.mdm.machineback.entity.MachineBackFile;
import org.springblade.mdm.machineback.mapper.MachineBackFileMapper;
import org.springblade.mdm.machineback.vo.MachineBackFileHandleQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileVO;
+import org.springblade.mdm.program.service.NcProgramService;
import org.springframework.stereotype.Service;
-
import java.util.List;
+@AllArgsConstructor
@Service
public class MachineBackFileService extends BizServiceImpl<MachineBackFileMapper, MachineBackFile> {
-
+ private final MachineFileService macineFileService;
+ private final OssTemplate ossTemplate;
/**
* 鎺ュ彈
* @param ids
@@ -27,12 +34,17 @@
public void accept(String ids) {
List<Long> idList = Func.toLongList(ids);
-
+ MachineFile mf;
for(Long id : idList){
+ mf = macineFileService.getById(id);
+ mf.setStatus(MachineFile.STATUS_ACCEPTED);
+ macineFileService.updateById(mf);
+
MachineBackFile backFile = this.getById(id);
backFile.setStatus(MachineBackFile.STATUS_ACCEPTED);
backFile.setConfirmTime(DateUtil.now());
this.updateById(backFile);
+
}
}
@@ -47,6 +59,7 @@
for(Long id : idList){
MachineBackFile backFile = this.getById(id);
backFile.setStatus(MachineBackFile.STATUS_REJECTED);
+ backFile.setConfirmTime(DateUtil.now());
this.updateById(backFile);
}
@@ -57,11 +70,11 @@
* @param query 鏌ヨ鍙傛暟
* @return 鍒嗛〉鏁版嵁
*/
+ /*
public IPage<MachineBackFileVO> pageQuery(MachineBackFileQueryVO query) {
IPage<MachineBackFileVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query),query);
-
return page;
- }
+ }*/
/**
* 鏈哄簥鍥炰紶绋嬪簭澶勭悊鍒嗛〉鏌ヨ
@@ -72,4 +85,6 @@
IPage<MachineBackFileVO> page = this.getBaseMapper().handlePageQuery(Condition.getPage(query),query);
return page;
}
+
+
}
--
Gitblit v1.9.3