From ebb0ec9bd15de8185994962c37b15a94c8b4ee0d Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 13 一月 2025 20:05:16 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 83 ++++++++++++++++++++++++++++-------------
1 files changed, 57 insertions(+), 26 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
index 6864afd..9795fa8 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -9,6 +9,7 @@
import org.jeecg.common.api.dto.message.MessageDTO;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.api.ISysBaseAPI;
+import org.jeecg.common.system.vo.DictModel;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.mdc.dto.MdcEquDepDto;
import org.jeecg.modules.mdc.dto.MdcEquProDto;
@@ -29,10 +30,7 @@
import org.jeecg.modules.system.entity.SysDepart;
import org.jeecg.modules.system.mapper.MdcEquipmentDepartMapper;
import org.jeecg.modules.system.mapper.MdcProductionEquipmentMapper;
-import org.jeecg.modules.system.service.IMdcProductionService;
-import org.jeecg.modules.system.service.IMdcUserProductionService;
-import org.jeecg.modules.system.service.ISysDepartService;
-import org.jeecg.modules.system.service.ISysUserDepartService;
+import org.jeecg.modules.system.service.*;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -67,8 +65,6 @@
@Resource
private IMdcProductionService mdcProductionService;
@Resource
- private IControlSystemService controlSystemService;
- @Resource
private IEquipmentWorkLineService equipmentWorkLineService;
@Resource
private IMdcDriveTypeParamConfigService mdcDriveTypeParamConfigService;
@@ -77,9 +73,6 @@
@Resource
private IEquipmentLogService equipmentLogService;
-
- @Resource
- private IEquipmentBaseInfoService equipmentBaseInfoService;
@Resource
private ISysBaseAPI sysBaseApi;
@@ -93,6 +86,11 @@
@Resource
private IMdcOverrunAlarmService mdcOverrunAlarmService;
+ @Resource
+ private IEquipmentXYZService equipmentXYZService;
+
+ @Resource
+ private ISysDictService sysDictService;
@Override
public Map<String, String> getDepNamesByEquipmentIds(List<String> equipmentIds) {
@@ -326,25 +324,35 @@
List<MdcEquipmentMonitor> result = this.baseMapper.checkStatusFromEquipmentIds(equipmentIds);
if (result != null && !result.isEmpty()) {
for (MdcEquipmentMonitor mdcEquipmentMonitor : result) {
- if (mdcEquipmentMonitor.getOporation() != null) {
- switch (mdcEquipmentMonitor.getOporation()) {
- case 1:
- case 2:
- mdcEquipmentMonitor.setOporationDict("寰呮満");
- break;
- case 3:
- mdcEquipmentMonitor.setOporationDict("杩愯");
- break;
- case 22:
- mdcEquipmentMonitor.setOporationDict("鎶ヨ");
- break;
- default:
- mdcEquipmentMonitor.setOporationDict("鍏虫満");
- break;
+ if (mdcEquipmentMonitor.getEquipmentStatus() == 0) {
+ if (mdcEquipmentMonitor.getOporation() != null) {
+ switch (mdcEquipmentMonitor.getOporation()) {
+ case 1:
+ case 2:
+ mdcEquipmentMonitor.setOporationDict("寰呮満");
+ break;
+ case 3:
+ mdcEquipmentMonitor.setOporationDict("杩愯");
+ break;
+ case 22:
+ mdcEquipmentMonitor.setOporationDict("鎶ヨ");
+ break;
+ default:
+ mdcEquipmentMonitor.setOporationDict("鍏虫満");
+ break;
+ }
+ } else {
+ mdcEquipmentMonitor.setOporationDict("鍏虫満");
+ mdcEquipmentMonitor.setOporation(0);
}
} else {
- mdcEquipmentMonitor.setOporationDict("鍏虫満");
- mdcEquipmentMonitor.setOporation(0);
+ List<DictModel> dictList = sysDictService.queryEnableDictItemsByCode(CommonConstant.DICT_EQUIPMENT_STATUS);
+ for (DictModel dictModel : dictList) {
+ if (Integer.valueOf(dictModel.getValue()).equals(mdcEquipmentMonitor.getEquipmentStatus())) {
+ mdcEquipmentMonitor.setOporationDict(dictModel.getLabel());
+ mdcEquipmentMonitor.setOporation(88);
+ }
+ }
}
}
}
@@ -454,6 +462,26 @@
}
}
result.put("runData", runData);
+
+ //鍧愭爣淇℃伅
+ // 鏌ヨ鍧愭爣淇℃伅
+ EquipmentXYZ equipmentXYZ = equipmentXYZService.getByEquipmentId(mdcEquipmentDetailedDto.getEquipmentId());
+ if (equipmentXYZ != null) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("xmachine", equipmentXYZ.getXMachine());
+ map.put("ymachine", equipmentXYZ.getYMachine());
+ map.put("zmachine", equipmentXYZ.getZMachine());
+ map.put("amachine", equipmentXYZ.getAMachine());
+ map.put("bmachine", equipmentXYZ.getBMachine());
+
+ map.put("xabsolute", equipmentXYZ.getXAbsolute());
+ map.put("yabsolute", equipmentXYZ.getYAbsolute());
+ map.put("zabsolute", equipmentXYZ.getZAbsolute());
+ map.put("aabsolute", equipmentXYZ.getAAbsolute());
+ map.put("babsolute", equipmentXYZ.getBAbsolute());
+ result.put("xyzList", map);
+ }
+
}
return result;
}
@@ -578,6 +606,9 @@
if (StringUtils.isNotEmpty(mdcEquipment.getEquipmentName())) {
queryWrapper.like(MdcEquipment::getEquipmentName, mdcEquipment.getEquipmentName());
}
+ if (mdcEquipment.getEquipmentStatus() != null) {
+ queryWrapper.eq(MdcEquipment::getEquipmentStatus, mdcEquipment.getEquipmentStatus());
+ }
if (!allEquipments.isEmpty()) {
queryWrapper.in(MdcEquipment::getEquipmentId, allEquipments);
} else if (!equipmentIdsByDepart.isEmpty() && equipmentIdsProduction.isEmpty()) {
--
Gitblit v1.9.3