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; }
@@ -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("添加成功！"); } lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
@@ -210,4 +210,10 @@ List<String> listEquipmentIdShift(MdcEfficiencyReportShiftQueryVo vo); /** * 从设备台账插入MDC设备 * @param mdcEquipment * @param productionId */ void addNewEquipmentFromEam(MdcEquipment mdcEquipment, String productionId); } 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); } }
