From bc4056543fdbef38ac8bf1648df934d5bc8e5bde Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 07 八月 2025 01:31:11 +0800
Subject: [PATCH] 调试固化流程
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java | 59 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 14 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 719d903..6d95ef7 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
@@ -2,22 +2,19 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.micrometer.common.util.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.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 org.springframework.util.FileSystemUtils;
-import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.InvalidPathException;
@@ -29,13 +26,56 @@
@Transactional
public void saveMachine(MachineSaveVO vo){
- //TODO
+ checkMachine(vo);
+ if(existsByCode(vo.getCode(),null)){
+ throw new ServiceException("鏈哄簥缂栫爜宸插瓨鍦�:"+vo.getCode());
+ }
+
Machine machine = new Machine();
BeanUtil.copyProperties(vo, machine);
+ machine.setId(null);
this.save(machine);
}
+ /**
+ * 妫�鏌ユ満搴婂綍鍏ユ暟鎹�
+ * @param vo 褰曞叆鐨勮〃鍗曟暟鎹甐O
+ */
+ void checkMachine(MachineSaveVO vo){
+ if(Func.isEmpty(vo.getCode())){
+ throw new ServiceException("鏈哄簥缂栫爜涓嶈兘涓虹┖");
+ }
+
+ if(Func.isEmpty(vo.getName())){
+ throw new ServiceException("鏈哄簥绫诲瀷涓嶈兘涓虹┖");
+ }
+
+ if(Func.isEmpty(vo.getMachineGroupCode())){
+ throw new ServiceException("鎵�灞炵粍缁囦笉鑳戒负绌�");
+ }
+
+ if(Func.isEmpty(vo.getMachineSpec())){
+ throw new ServiceException("鏈哄簥绫诲瀷涓嶈兘涓虹┖");
+ }
+ }
+
+ /**
+ * 鏍规嵁鏈哄簥缂栫爜鍒ゆ柇鏈哄簥鏄惁瀛樺湪
+ * @param code 鏈哄簥缂栫爜
+ * @param excludeId 鎺掗櫎id
+ * @return 鏄惁瀛樺湪
+ */
+ boolean existsByCode(String code,Long excludeId){
+ return this.lambdaQuery().eq(Machine::getCode, code).ne(excludeId!=null,Machine::getId, excludeId).count()>0;
+ }
+
public boolean updateMachine(MachineSaveVO vo) {
+
+ checkMachine(vo);
+ if(existsByCode(vo.getCode(),vo.getId())){
+ throw new ServiceException("鏈哄簥缂栫爜宸插瓨鍦�:"+vo.getCode());
+ }
+
Machine machine = this.getById(vo.getId());
machine.setMachineSpec(vo.getMachineSpec());
@@ -71,15 +111,6 @@
//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);
-
- //MachineSpec.valueOf()
- for (MachineVO record : page.getRecords()) {
- if(record.getMachineSpec() != null){
- MachineSpec spec = MachineSpec.valueOf(record.getMachineSpec());
- record.setMachineSpecName(spec.getText());
- }
-
- }
return page;
}
--
Gitblit v1.9.3