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-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 37 ++++++++++++++++++++++++++++++++++++- 1 files changed, 36 insertions(+), 1 deletions(-) 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 5954d6f..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 @@ -380,7 +386,7 @@ @Override public List<MdcEquipmentTree> loadTreeListByProduction(String userId) { //鑾峰彇鎵�鏈変骇绾挎暟鎹� - List<MdcProduction> productionList = mdcProductionService.list(new LambdaQueryWrapper<MdcProduction>().eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0.toString()).orderByAsc(MdcProduction::getProductionOrder)); + List<MdcProduction> productionList = mdcProductionService.list(new LambdaQueryWrapper<MdcProduction>().eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0.toString()).eq(MdcProduction::getMdcFlag, CommonConstant.DEFAULT_1).orderByAsc(MdcProduction::getProductionOrder)); //鏍规嵁鐢ㄦ埛id鑾峰彇鎷ユ湁鐨勪骇绾夸俊鎭泦鍚� List<String> productionIds = mdcUserProductionService.queryProductionIdsByUserId(userId); List<String> allProductionIds = new ArrayList<>(); @@ -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