From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:39:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 153 +++++++++++++++++++++++++++++---------------------
1 files changed, 89 insertions(+), 64 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 45cca50..4a9d25f 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
@@ -18,6 +18,7 @@
import org.jeecg.modules.mdc.mapper.XYZAliasesMapper;
import org.jeecg.modules.mdc.model.MdcEquipmentTree;
import org.jeecg.modules.mdc.service.*;
+import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.util.FindsEquipmentDepartUtil;
import org.jeecg.modules.mdc.util.FindsEquipmentProductionUtil;
import org.jeecg.modules.mdc.vo.MdcEquipmentDepVo;
@@ -379,76 +380,82 @@
String englishName = mdcDriveTypeParamConfig.getEnglishName();
JSONObject jsonObject = (JSONObject) JSONObject.toJSON(dto);
Object result = jsonObject.get(englishName);
- String value = result == null ? null : result.toString();
+ String value = "";
+ if ("CollectTime".equals(englishName)) {
+ Date date = result == null ? null : (Date) result;
+ value = DateUtils.format(date, DateUtils.STR_DATE_TIME_SMALL);
+ } else {
+ value = result == null ? null : result.toString();
+ }
mdcDriveTypeParamConfig.setValue(value);
}
mdcEquipmentDto.setMdcDriveTypeParamConfigList(mdcDriveTypeParamList);
}
}
- // 璁惧鍧愭爣鏁� 鑾峰彇璁惧闇�瑕侀噰闆嗙殑鍧愭爣淇℃伅
- List<XYZAliases> equipmentCoordinateList = xyzAliasesMapper.getCoordinateByEquipmentId(mdcEquipment.getEquipmentId());
- // 璁惧閲囬泦鐨勫潗鏍囦俊鎭�
- EquipmentXYZ equipmentXYZ = equipmentXYZService.getByEquipmentId(mdcEquipment.getEquipmentId());
- JSONObject jsonEquipmentXYZ = (JSONObject) JSONObject.toJSON(equipmentXYZ);
- if (equipmentCoordinateList != null && !equipmentCoordinateList.isEmpty()) {
- for (XYZAliases xyzAliases : equipmentCoordinateList) {
- String englishName = xyzAliases.getXYZFieldName().toLowerCase();
- englishName = englishName.substring(0, 1) + "_" + englishName.substring(1, englishName.length());
- englishName = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, englishName);
- Object orgValue = jsonEquipmentXYZ.get(englishName);
- String value = orgValue != null ? orgValue.toString() : null;
- // 鍧愭爣鏁版嵁鐨則itle 鏉ヨ嚜 xyzAliases 琛�, 鏍规嵁 鏄惁鍖呭惈 absolute 鍜� machine 鍒ゆ柇鏄粷瀵瑰潗鏍囪繕鏄満搴婂潗鏍�
- String title = englishName.substring(0, 1).toUpperCase();
- title = englishName.contains("absolute") ? "缁濆鍧愭爣" + title : "鏈哄簥鍧愭爣" + title;
- xyzAliases.setTitle(title);
- xyzAliases.setValue(value);
- }
- mdcEquipmentDto.setXyzAliasesList(equipmentCoordinateList);
- }
+// // 璁惧鍧愭爣鏁� 鑾峰彇璁惧闇�瑕侀噰闆嗙殑鍧愭爣淇℃伅
+// List<XYZAliases> equipmentCoordinateList = xyzAliasesMapper.getCoordinateByEquipmentId(mdcEquipment.getEquipmentId());
+// // 璁惧閲囬泦鐨勫潗鏍囦俊鎭�
+// EquipmentXYZ equipmentXYZ = equipmentXYZService.getByEquipmentId(mdcEquipment.getEquipmentId());
+// JSONObject jsonEquipmentXYZ = (JSONObject) JSONObject.toJSON(equipmentXYZ);
+// if (equipmentCoordinateList != null && !equipmentCoordinateList.isEmpty()) {
+// for (XYZAliases xyzAliases : equipmentCoordinateList) {
+// String englishName = xyzAliases.getXYZFieldName().toLowerCase();
+// englishName = englishName.substring(0, 1) + "_" + englishName.substring(1, englishName.length());
+// englishName = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, englishName);
+// Object orgValue = jsonEquipmentXYZ.get(englishName);
+// String value = orgValue != null ? orgValue.toString() : null;
+// // 鍧愭爣鏁版嵁鐨則itle 鏉ヨ嚜 xyzAliases 琛�, 鏍规嵁 鏄惁鍖呭惈 absolute 鍜� machine 鍒ゆ柇鏄粷瀵瑰潗鏍囪繕鏄満搴婂潗鏍�
+// String title = englishName.substring(0, 1).toUpperCase();
+// title = englishName.contains("absolute") ? "缁濆鍧愭爣" + title : "鏈哄簥鍧愭爣" + title;
+// xyzAliases.setTitle(title);
+// xyzAliases.setValue(value);
+// }
+// mdcEquipmentDto.setXyzAliasesList(equipmentCoordinateList);
+// }
- if (equipmentXYZ != null) {
- mdcEquipmentDto.setXmachine(equipmentXYZ.getXMachine());
- mdcEquipmentDto.setYmachine(equipmentXYZ.getYMachine());
- mdcEquipmentDto.setZmachine(equipmentXYZ.getZMachine());
- mdcEquipmentDto.setAmachine(equipmentXYZ.getAMachine());
- mdcEquipmentDto.setBmachine(equipmentXYZ.getBMachine());
- mdcEquipmentDto.setXabsolute(equipmentXYZ.getXAbsolute());
- mdcEquipmentDto.setYabsolute(equipmentXYZ.getYAbsolute());
- mdcEquipmentDto.setZabsolute(equipmentXYZ.getZAbsolute());
- mdcEquipmentDto.setAabsolute(equipmentXYZ.getAAbsolute());
- mdcEquipmentDto.setBabsolute(equipmentXYZ.getBAbsolute());
- }
- EquipmentBaseInfo equipmentBaseInfo = equipmentBaseInfoService.getByEquipmentId(mdcEquipment.getEquipmentId());
- if (equipmentBaseInfo != null) {
- mdcEquipmentDto.setMaxAxis(equipmentBaseInfo.getMaxAxis());
- mdcEquipmentDto.setValidAxis(equipmentBaseInfo.getValidAxis());
- }
- if (controlSystem.getDriveType().equals("SIEMENS840DSL")) {
- EquipmentTemperatureDto equipmentTemperature = equipmentTemperatureService.getEquipmentTemperature(mdcEquipment.getEquipmentId());
- if (equipmentTemperature != null) {
- mdcEquipmentDto.setTemperatureX(equipmentTemperature.getX());
- mdcEquipmentDto.setTemperatureY(equipmentTemperature.getY());
- mdcEquipmentDto.setTemperatureZ(equipmentTemperature.getZ());
- mdcEquipmentDto.setTemperatureA(equipmentTemperature.getA());
- mdcEquipmentDto.setTemperatureB(equipmentTemperature.getB());
- }
- EquipmentTemperatureDto equipmentLagError = equipmentTemperatureService.getEquipmentLagError(mdcEquipment.getEquipmentId());
- if (equipmentLagError != null) {
- mdcEquipmentDto.setEquipmentLagErrorX(equipmentLagError.getX());
- mdcEquipmentDto.setEquipmentLagErrorY(equipmentLagError.getY());
- mdcEquipmentDto.setEquipmentLagErrorZ(equipmentLagError.getZ());
- mdcEquipmentDto.setEquipmentLagErrorA(equipmentLagError.getA());
- mdcEquipmentDto.setEquipmentLagErrorB(equipmentLagError.getB());
- }
- }
- EquipmentTemperatureDto equipmentCurrent = equipmentTemperatureService.getEquipmentCurrent(mdcEquipment.getEquipmentId());
- if (equipmentCurrent != null) {
- mdcEquipmentDto.setEquipmentCurrentX(equipmentCurrent.getX());
- mdcEquipmentDto.setEquipmentCurrentY(equipmentCurrent.getY());
- mdcEquipmentDto.setEquipmentCurrentZ(equipmentCurrent.getZ());
- mdcEquipmentDto.setEquipmentCurrentA(equipmentCurrent.getA());
- mdcEquipmentDto.setEquipmentCurrentB(equipmentCurrent.getB());
- }
+// if (equipmentXYZ != null) {
+// mdcEquipmentDto.setXmachine(equipmentXYZ.getXMachine());
+// mdcEquipmentDto.setYmachine(equipmentXYZ.getYMachine());
+// mdcEquipmentDto.setZmachine(equipmentXYZ.getZMachine());
+// mdcEquipmentDto.setAmachine(equipmentXYZ.getAMachine());
+// mdcEquipmentDto.setBmachine(equipmentXYZ.getBMachine());
+// mdcEquipmentDto.setXabsolute(equipmentXYZ.getXAbsolute());
+// mdcEquipmentDto.setYabsolute(equipmentXYZ.getYAbsolute());
+// mdcEquipmentDto.setZabsolute(equipmentXYZ.getZAbsolute());
+// mdcEquipmentDto.setAabsolute(equipmentXYZ.getAAbsolute());
+// mdcEquipmentDto.setBabsolute(equipmentXYZ.getBAbsolute());
+// }
+// EquipmentBaseInfo equipmentBaseInfo = equipmentBaseInfoService.getByEquipmentId(mdcEquipment.getEquipmentId());
+// if (equipmentBaseInfo != null) {
+// mdcEquipmentDto.setMaxAxis(equipmentBaseInfo.getMaxAxis());
+// mdcEquipmentDto.setValidAxis(equipmentBaseInfo.getValidAxis());
+// }
+// if (controlSystem.getDriveType().equals("SIEMENS840DSL")) {
+// EquipmentTemperatureDto equipmentTemperature = equipmentTemperatureService.getEquipmentTemperature(mdcEquipment.getEquipmentId());
+// if (equipmentTemperature != null) {
+// mdcEquipmentDto.setTemperatureX(equipmentTemperature.getX());
+// mdcEquipmentDto.setTemperatureY(equipmentTemperature.getY());
+// mdcEquipmentDto.setTemperatureZ(equipmentTemperature.getZ());
+// mdcEquipmentDto.setTemperatureA(equipmentTemperature.getA());
+// mdcEquipmentDto.setTemperatureB(equipmentTemperature.getB());
+// }
+// EquipmentTemperatureDto equipmentLagError = equipmentTemperatureService.getEquipmentLagError(mdcEquipment.getEquipmentId());
+// if (equipmentLagError != null) {
+// mdcEquipmentDto.setEquipmentLagErrorX(equipmentLagError.getX());
+// mdcEquipmentDto.setEquipmentLagErrorY(equipmentLagError.getY());
+// mdcEquipmentDto.setEquipmentLagErrorZ(equipmentLagError.getZ());
+// mdcEquipmentDto.setEquipmentLagErrorA(equipmentLagError.getA());
+// mdcEquipmentDto.setEquipmentLagErrorB(equipmentLagError.getB());
+// }
+// }
+// EquipmentTemperatureDto equipmentCurrent = equipmentTemperatureService.getEquipmentCurrent(mdcEquipment.getEquipmentId());
+// if (equipmentCurrent != null) {
+// mdcEquipmentDto.setEquipmentCurrentX(equipmentCurrent.getX());
+// mdcEquipmentDto.setEquipmentCurrentY(equipmentCurrent.getY());
+// mdcEquipmentDto.setEquipmentCurrentZ(equipmentCurrent.getZ());
+// mdcEquipmentDto.setEquipmentCurrentA(equipmentCurrent.getA());
+// mdcEquipmentDto.setEquipmentCurrentB(equipmentCurrent.getB());
+// }
}
return mdcEquipmentDto;
}
@@ -469,6 +476,9 @@
}
}
//鏍规嵁浜х嚎闆嗗悎鏌ユ壘鎵�鏈夎澶噄d
+ if (allDepartIds.isEmpty()) {
+ return null;
+ }
List<String> equipmentIds = this.baseMapper.queryIdsByDeparts(allDepartIds);
if (StringUtils.isNotEmpty(key)) {
//key涓嶄负绌猴紝鏌ヨ鎵�鏈変笅绾ч儴闂╥d
@@ -515,6 +525,9 @@
}
}
//鏍规嵁浜х嚎闆嗗悎鏌ユ壘鎵�鏈夎澶噄d
+ if (allProductionIds.isEmpty()) {
+ return null;
+ }
List<String> equipmentIds = this.baseMapper.queryIdsByProductions(allProductionIds);
if (StringUtils.isNotEmpty(key)) {
//key涓嶄负绌猴紝鏌ヨ鎵�鏈変笅绾т骇绾縤d
@@ -669,4 +682,16 @@
return this.baseMapper.findEquProList(equipmentIdList);
}
+ /**
+ * 鏍规嵁閮ㄩ棬灞傜骇鏌ヨ璁惧鍗曚釜
+ */
+ @Override
+ public MdcEquipment getEquipmentByDepPid(String pid, String userId) {
+ List<String> idsByDepart = this.getEquipmentIdsByDepart(userId, pid);
+ if (idsByDepart != null && !idsByDepart.isEmpty()) {
+ return super.getOne(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentId, idsByDepart.get(0)));
+ }
+ return null;
+ }
+
}
--
Gitblit v1.9.3