From ee0c27cf30140d50b91fe4e08fa48052e910fd1f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 29 七月 2025 19:04:19 +0800
Subject: [PATCH] 机床类型去掉枚举
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java | 89 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 78 insertions(+), 11 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java
index 4393ff3..97f7619 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java
@@ -5,14 +5,20 @@
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.entity.Machine;
-import org.springblade.mdm.basesetting.machine.entity.MachineSpec;
import org.springblade.mdm.basesetting.machine.mapper.MachineMapper;
import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
import org.springblade.mdm.basesetting.machine.vo.MachineSaveVO;
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
@Service
public class MachineService extends BizServiceImpl<MachineMapper, Machine> {
@@ -29,6 +35,7 @@
Machine machine = this.getById(vo.getId());
machine.setMachineSpec(vo.getMachineSpec());
+ machine.setCode(vo.getCode());
machine.setName(vo.getName());
machine.setMachineGroupCode(vo.getMachineGroupCode());
machine.setManufacturer(vo.getManufacturer());
@@ -38,6 +45,7 @@
machine.setPollingHours(vo.getPollingHours());
machine.setProgSendDir(vo.getProgSendDir());
machine.setProgReceiveDir(vo.getProgReceiveDir());
+ machine.setStatus(vo.getStatus());
machine.setRemark(vo.getRemark());
return this.updateById(machine);
@@ -54,17 +62,76 @@
public IPage<MachineVO> pageQuery(MachineQueryVO query) {
LambdaQueryWrapper<Machine> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(query.getMachineGroupCode()!=null, Machine::getMachineGroupCode, query.getMachineGroupCode());
- IPage<MachineVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query),queryWrapper);
+ //queryWrapper.eq(query.getMachineGroupCode()!=null, Machine::getMachineGroupCode, query.getMachineGroupCode());
+ //String keys = query.getKeyword();
- //MachineSpec.valueOf()
- for (MachineVO record : page.getRecords()) {
- if(record.getMachineSpec() != null){
- MachineSpec spec = MachineSpec.valueOf(record.getMachineSpec());
- record.setMachineSpecName(spec.getText());
- }
-
- }
+ //queryWrapper.and(StringUtils.isNotEmpty(keys), wrapper -> wrapper.like(Machine::getCode, keys).or().like(Machine::getName, keys));
+ IPage<MachineVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query),query);
return page;
}
+
+ /**
+ * 鏌ヨ璇︽儏
+ * @param id 鏈哄簥id
+ * @return
+ */
+ public MachineVO detail(long id) {
+ Machine machine = this.getById(id);
+
+ MachineVO vo = new MachineVO();
+ BeanUtil.copyProperties(machine, vo);
+
+ return vo;
+ }
+
+ /**
+ * 浜х敓鏈哄簥鍥炰紶缁撴瀯鏁版嵁
+ * @param id
+ */
+ public void genMachineFileBackDirs(Long id) throws IOException {
+ Machine machine = this.getById(id);
+ if(Func.isNotBlank(machine.getProgReceiveDir())){
+ if(isLegalDirectoryPath(machine.getProgReceiveDir())) {
+ Path path = Paths.get(machine.getProgReceiveDir());
+ Files.createDirectories(path);
+ }else{
+ throw new RuntimeException("闈炴硶鐨勭洰褰曟牸寮�");
+ }
+ }
+ }
+
+ /**
+ * 鍒ゆ柇鏄惁鏄悎娉曠殑鐩綍鏍煎紡
+ * @param path
+ * @return
+ */
+ static boolean isLegalDirectoryPath(String path) {
+ // 鍩虹妫�鏌�
+ if (path == null || path.trim().isEmpty()) {
+ return false;
+ }
+
+ // 浣跨敤NIO妫�鏌ヨ矾寰勬牸寮�
+ Path nioPath;
+ try {
+ nioPath = Paths.get(path);
+ if (!nioPath.normalize().toString().equals(path)) {
+ return false; // 璺緞涓嶈鑼�
+ }
+ } catch (InvalidPathException ex) {
+ return false;
+ }
+
+ return true;
+
+ }
+
+ /**
+ * 鏍规嵁鏈哄簥缂栫爜鑾峰彇鏈哄簥
+ * @param machineCode 鏈哄簥缂栫爜
+ * @return
+ */
+ public Machine getByCode(String machineCode) {
+ return this.lambdaQuery().eq(Machine::getCode, machineCode).one();
+ }
}
--
Gitblit v1.9.3