From 5f470251b97ecf69aa77c654434f9af8ed16d9e2 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 25 三月 2025 09:20:34 +0800
Subject: [PATCH] art: 设备台账-新增 修改
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 2 +-
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 35 +++++++++++++++++++++++++++++++++++
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java | 6 ++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 17 ++++++++++++++++-
4 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
index 59a388c..0079e3f 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -66,7 +66,7 @@
equipmentExtendService.save(eamEquipmentExtend);
- //鎻掑叆璁惧灞ュ巻 TODO
+ //鎻掑叆璁惧灞ュ巻 @EquipmentHistoryLog
return eamEquipment;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index 0433218..748d86a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -8,11 +8,14 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.vo.EamEquipmentTree;
+import org.jeecg.modules.mdc.entity.MdcEquipment;
+import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -35,6 +38,9 @@
public class EamEquipmentController extends JeecgController<EamEquipment, IEamEquipmentService> {
@Autowired
private IEamEquipmentService eamEquipmentService;
+
+ @Autowired
+ private IMdcEquipmentService mdcEquipmentService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -70,7 +76,16 @@
public Result<?> add(@RequestBody EamEquipment eamEquipment) {
EamEquipment entity = eamEquipmentService.saveEquipment(eamEquipment);
if (entity == null) {
- Result.OK("娣诲姞澶辫触锛�");
+ return Result.OK("娣诲姞澶辫触锛�");
+ }
+ //璋冪敤mdcEquipment鎻掑叆MDC璁惧
+ if(CommonConstant.DEFAULT_1.equals(eamEquipment.getMdcFlag())) {
+ //鎻掑叆MDC璁惧
+ MdcEquipment mdcEquipment = new MdcEquipment();
+ mdcEquipment.setEquipmentId(entity.getEquipmentCode());
+ mdcEquipment.setEquipmentType(entity.getDeviceType());
+ mdcEquipment.setEquipmentName(entity.getEquipmentName());
+ mdcEquipmentService.addNewEquipmentFromEam(mdcEquipment, eamEquipment.getOrgId());
}
return Result.OK("娣诲姞鎴愬姛锛�");
}
diff --git a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
index 5e20315..a8e4cde 100644
--- a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
+++ b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
@@ -210,4 +210,10 @@
List<String> listEquipmentIdShift(MdcEfficiencyReportShiftQueryVo vo);
+ /**
+ * 浠庤澶囧彴璐︽彃鍏DC璁惧
+ * @param mdcEquipment
+ * @param productionId
+ */
+ void addNewEquipmentFromEam(MdcEquipment mdcEquipment, String productionId);
}
diff --git a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
index e55a56b..4849ff7 100644
--- a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
+++ b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.dto.message.MessageDTO;
@@ -31,6 +32,7 @@
import org.jeecg.modules.system.mapper.MdcEquipmentDepartMapper;
import org.jeecg.modules.system.mapper.MdcProductionEquipmentMapper;
import org.jeecg.modules.system.service.*;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.stereotype.Service;
@@ -50,6 +52,7 @@
* @Date: 2023-03-22
* @Version: V1.0
*/
+@Slf4j
@Service
public class MdcEquipmentServiceImpl extends ServiceImpl<MdcEquipmentMapper, MdcEquipment> implements IMdcEquipmentService {
@@ -92,6 +95,9 @@
@Value("${fileNCPath}")
private String fileNCPath;
+
+ @Autowired
+ private IEquipmentService equipmentService;
@Override
@@ -974,4 +980,33 @@
return list.stream().map(MdcEquipment::getEquipmentId).collect(Collectors.toList());
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void addNewEquipmentFromEam(MdcEquipment mdcEquipment, String productionId) {
+ //榛樿绯荤粺绫诲瀷
+ mdcEquipment.setSystemValue("3");
+ //鍒ゆ柇MDC鏄惁宸叉坊鍔犳璁惧
+ MdcEquipment entity = this.getBaseMapper().selectOne(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentId, mdcEquipment.getEquipmentId()));
+ if (entity != null) {
+ //MDC宸茬粡瀛樺湪姝よ澶�
+ log.warn("MDC宸茬粡瀛樺湪姝よ澶�, equipmentId={}", mdcEquipment.getEquipmentId());
+ return;
+ }
+ Equipment equipment = equipmentService.getOne(new LambdaQueryWrapper<Equipment>().eq(Equipment::getEquipmentid, mdcEquipment.getEquipmentId()));
+ if(equipment == null) {
+ //閲囬泦鏈厤缃�
+ log.warn("閲囬泦鏈厤缃�, equipmentId={}", mdcEquipment.getEquipmentId());
+ return;
+ }
+ //璁剧疆鍊�
+ mdcEquipment.setEquipmentIp(equipment.getEquipmentip());
+ mdcEquipment.setEquipmentModel(equipment.getEquipmentmodel());
+ mdcEquipment.setDataPort(equipment.getDataport());
+ mdcEquipment.setDriveType(equipment.getDrivetype());
+ mdcEquipment.setControlSystem(equipment.getControlsystem());
+ mdcEquipment.setSaveTableName(equipment.getSavetablename());
+
+ this.saveMdcEquipment(mdcEquipment, null, productionId);
+ }
+
}
--
Gitblit v1.9.3