From 0b280642ec2c179f2f0ce5dda18abfc5086fee6f Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 19 四月 2024 15:39:55 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java | 61 ++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java
index 50938c4..b75d891 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java
@@ -2,18 +2,23 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import org.jeecg.modules.mdc.entity.EquipmentLog;
+import org.jeecg.common.system.vo.DictModel;
+import org.jeecg.modules.mdc.constant.MdcConstant;
+import org.jeecg.modules.mdc.dto.MdcEquipmentDto;
+import org.jeecg.modules.mdc.entity.Equipment;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcEquipmentStatisticalInfo;
import org.jeecg.modules.mdc.entity.MdcOverallEquipmentEfficiency;
import org.jeecg.modules.mdc.mapper.MdcHomeMapper;
-import org.jeecg.modules.mdc.service.IEquipmentLogService;
+import org.jeecg.modules.mdc.service.IEquipmentService;
+import org.jeecg.modules.mdc.service.IEquipmentWorkLineService;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.service.IMdcHomeService;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.vo.*;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.service.IMdcProductionService;
+import org.jeecg.modules.system.service.ISysDictService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -33,7 +38,13 @@
private IMdcEquipmentService mdcEquipmentService;
@Resource
- private IEquipmentLogService equipmentLogService;
+ private IEquipmentService equipmentService;
+
+ @Resource
+ private ISysDictService sysDictService;
+
+ @Resource
+ private IEquipmentWorkLineService equipmentWorkLineService;
@Resource
private MdcHomeMapper mdcHomeMapper;
@@ -71,11 +82,12 @@
if (equipmentIdList == null || equipmentIdList.isEmpty()) {
return result;
}
- List<EquipmentLog> logList = equipmentLogService.getEquipmentStatusList(equipmentIdList);
- if (logList != null && !logList.isEmpty()) {
- for (EquipmentLog equipmentLog : logList) {
- if (equipmentLog.getOporation() != null) {
- switch (equipmentLog.getOporation()) {
+// List<EquipmentLog> logList = equipmentLogService.getEquipmentStatusList(equipmentIdList);
+ List<Equipment> equipmentList = equipmentService.list(new LambdaQueryWrapper<Equipment>().in(Equipment::getEquipmentid, equipmentIdList));
+ if (equipmentList != null && !equipmentList.isEmpty()) {
+ for (Equipment equipment : equipmentList) {
+ if (equipment.getOporation() != null) {
+ switch (equipment.getOporation()) {
case 1:
case 2:
mdcEquipmentStatusVo.setWaitCount(mdcEquipmentStatusVo.getWaitCount() + 1);
@@ -371,6 +383,10 @@
*/
@Override
public MdcHomeEfficiencyVo getEquipmentLevelEfficiencyStatistics(String equipmentId) {
+ MdcEquipment mdcEquipment = mdcEquipmentService.getOne(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentId, equipmentId));
+ if (mdcEquipment == null) {
+ return null;
+ }
MdcHomeEfficiencyVo result = new MdcHomeEfficiencyVo();
String date = DateUtils.format(DateUtils.toDate(LocalDate.now().plusDays(-1).toString(), DateUtils.STR_DATE), DateUtils.STRDATE);
MdcEquipmentStatisticalInfo mdcEquipmentStatisticalInfo = mdcHomeMapper.getUtilizationByDay(Arrays.asList(equipmentId.split(",")), date);
@@ -397,6 +413,10 @@
*/
@Override
public Map<String, Object> getEquipmentAnnualEfficiencyStatistics(String equipmentId) {
+ MdcEquipment mdcEquipment = mdcEquipmentService.getOne(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentId, equipmentId));
+ if (mdcEquipment == null) {
+ return null;
+ }
Map<String, Object> result = new HashMap<>();
Date end = DateUtils.toDate(LocalDate.now().plusMonths(-1).toString(), DateUtils.STR_DATE);
Date start = DateUtils.toDate(LocalDate.now().plusMonths(-12).toString(), DateUtils.STR_DATE);
@@ -443,4 +463,29 @@
public List<MdcEquipment> getEquipmentList(String key) {
return mdcHomeMapper.getEquipmentList(key);
}
+
+ @Override
+ public MdcEquipmentDto getEquipmentDetails(String equipmentId) {
+ MdcEquipment mdcEquipment = mdcEquipmentService.getOne(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentId, equipmentId));
+ List<DictModel> dictModelList = sysDictService.queryEnableDictItemsByCode(MdcConstant.SERIA_TYPE);
+ if (dictModelList != null && !dictModelList.isEmpty()) {
+ for (DictModel dictModel : dictModelList) {
+ if (dictModel.getValue().equals(mdcEquipment.getDriveType())) {
+ return null;
+ }
+ }
+ }
+ String saveTableName = mdcEquipment.getSaveTableName();
+ MdcEquipmentDto dto = equipmentWorkLineService.getMacingDataList(saveTableName);
+ if ("LSV2".equals(mdcEquipment.getDriveType())) {
+ dto.setSpindlebeilv(dto.getSFeed());
+ dto.setFeedbeilv(dto.getFFeed());
+ dto.setRapidfeed(dto.getRapidfeed());
+ dto.setNCVersion(dto.getNCVersion());
+ dto.setTNCVersion(dto.getTNCVersion());
+ dto.setOPTVersion(dto.getOPTVersion());
+ dto.setPLCVersion(dto.getPLCVersion());
+ }
+ return dto;
+ }
}
--
Gitblit v1.9.3