From 538857185263f29b325de9a34ae066c21b7cd371 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 22 八月 2025 11:33:37 +0800
Subject: [PATCH] 全部提交
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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 abe1d8d..8cfa102 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,6 +2,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
@@ -10,11 +12,19 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.machine.mapper.MachineMapper;
+import org.springblade.mdm.basesetting.machine.vo.MachineExcel;
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.springblade.mdm.basesetting.producedivision.entity.MdmDept;
+import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
+import org.springblade.mdm.basesetting.producedivision.service.MdmDeptService;
+import org.springblade.mdm.basesetting.producedivision.vo.DivisionExcel;
+import org.springblade.mdm.basesetting.producedivision.vo.ImportResult;
+import org.springblade.mdm.basesetting.producedivision.vo.QinzheFgbExcel;
import org.springblade.system.feign.ISysClient;
import org.springblade.system.pojo.entity.Dept;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -25,11 +35,15 @@
import java.nio.file.InvalidPathException;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
@Service
public class MachineService extends BizServiceImpl<MachineMapper, Machine> {
@Autowired
private ISysClient sysClient;
+ @Autowired
+ private MdmDeptService mdmDeptService;
@Transactional
public void saveMachine(MachineSaveVO vo){
checkMachine(vo);
@@ -92,11 +106,13 @@
machine.setOperator(vo.getOperator());
machine.setControlSystem(vo.getControlSystem());
machine.setOwnerDept(vo.getOwnerDept());
- machine.setPollingHours(vo.getPollingHours());
machine.setProgSendDir(vo.getProgSendDir());
machine.setProgReceiveDir(vo.getProgReceiveDir());
+ machine.setProgTempDir(vo.getProgTempDir());
machine.setStatus(vo.getStatus());
machine.setRemark(vo.getRemark());
+ machine.setSendDirExpiryHours(vo.getSendDirExpiryHours());
+ machine.setReceiveDirExpiryHours(vo.getReceiveDirExpiryHours());
return this.updateById(machine);
}
@@ -117,9 +133,7 @@
query.setDeptAncestors(rs.getData().getAncestors()+","+rs.getData().getId());
}
}
- IPage<MachineVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query), query);
-
- return page;
+ return this.getBaseMapper().pageQuery(Condition.getPage(query), query);
}
/**
@@ -187,8 +201,5 @@
return this.lambdaQuery().eq(Machine::getCode, machineCode).one();
}
- @Transactional
- public String importMachines(MultipartFile file) {
- return "";//瀵煎叆鎴愬姛锛岀粰绌轰覆锛岄儴鍒嗕笉鎴愬姛缁欐彁绀�
- }
+
}
--
Gitblit v1.9.3