From 3e784708e465b4dca8c47514cf6119e63fd4b3a5 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 25 六月 2024 16:27:40 +0800
Subject: [PATCH] 设备详细信息接口更新
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 108 +++++++++++++++++------------------------------------
1 files changed, 35 insertions(+), 73 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 c5db8a6..e3e5503 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
@@ -12,6 +12,7 @@
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.mdc.dto.MdcEquDepDto;
import org.jeecg.modules.mdc.dto.MdcEquProDto;
+import org.jeecg.modules.mdc.dto.MdcEquipmentDetailedDto;
import org.jeecg.modules.mdc.dto.MdcEquipmentDto;
import org.jeecg.modules.mdc.entity.*;
import org.jeecg.modules.mdc.mapper.MdcEquipmentMapper;
@@ -354,87 +355,52 @@
* 璁惧鐩戞帶 - 璁惧璇︾粏淇℃伅
*/
@Override
- public MdcEquipmentDto mdcEquipmentDetailedInfo(String id) {
- MdcEquipmentDto mdcEquipmentDto = new MdcEquipmentDto();
- MdcEquipment mdcEquipment = this.baseMapper.selectById(id);
- //灏佽鍩虹淇℃伅
- mdcEquipmentDto.setSystemVersion(mdcEquipment.getSystemVersion());
- mdcEquipmentDto.setSystemType(mdcEquipment.getControlSystem());
- mdcEquipmentDto.setDevicePower(mdcEquipment.getDevicePower());
- mdcEquipmentDto.setDeviceType(mdcEquipment.getDriveType());
- mdcEquipmentDto.setRemark(mdcEquipment.getRemark());
- //璁惧缂栧彿
- mdcEquipmentDto.setEquipmentID(mdcEquipment.getEquipmentId());
- mdcEquipmentDto.setEquipmentName(mdcEquipment.getEquipmentName());
- mdcEquipmentDto.setEquipmentIP(mdcEquipment.getEquipmentIp());
- //璁惧鍨嬪彿
- mdcEquipmentDto.setEquipmentModel(mdcEquipment.getEquipmentModel());
- mdcEquipmentDto.setDriveType(mdcEquipment.getDriveType());
- mdcEquipmentDto.setDataPort(mdcEquipment.getDataPort());
- mdcEquipmentDto.setDataFlag(Integer.parseInt(CommonConstant.STATUS_1));
- ControlSystem controlSystem = controlSystemService.getByDriveType(mdcEquipmentDto.getDriveType());
+ public Map<String, Object> mdcEquipmentDetailedInfo(String id) {
+ Map<String, Object> result = new HashMap<>();
+ MdcEquipmentDetailedDto mdcEquipmentDetailedDto = this.baseMapper.findById(id);
+ result.put("equipment", mdcEquipmentDetailedDto);
// 鏌ヨ璁惧鐘舵��
- EquipmentLog equipmentLog = equipmentLogService.selectEquipmentOporation(mdcEquipment.getEquipmentId());
+ EquipmentLog equipmentLog = equipmentLogService.selectEquipmentOporation(mdcEquipmentDetailedDto.getEquipmentId());
if (equipmentLog == null) {
- return mdcEquipmentDto;
+ return result;
}
Integer oporation = equipmentLog.getOporation();
-
- if (controlSystem != null) {
- //鑾峰彇宸ヤ綔鏁版嵁骞跺垵濮嬪寲
- String saveTableName = mdcEquipment.getSaveTableName();
- MdcEquipmentDto dto = equipmentWorkLineService.getMacingDataList(saveTableName);
- if (dto != null) {
- mdcEquipmentDto.setCollectTime(dto.getCollectTime());
- mdcEquipmentDto.setSpindlespeed(dto.getSpindlespeed());
- mdcEquipmentDto.setSpindleload(dto.getSpindleload());
- mdcEquipmentDto.setSpindlebeilv(dto.getSpindlebeilv());
- mdcEquipmentDto.setFeedrate(dto.getFeedrate());
- mdcEquipmentDto.setFeedbeilv(dto.getFeedbeilv());
- mdcEquipmentDto.setProgramnumber(dto.getProgramnumber());
- mdcEquipmentDto.setSequencenumber(dto.getSequencenumber());
- mdcEquipmentDto.setExecutingcode(dto.getExecutingcode());
- mdcEquipmentDto.setProductName(dto.getProductName());
- if ("LSV2".equals(mdcEquipment.getDriveType())) {
- mdcEquipmentDto.setSpindlebeilv(dto.getSFeed());
- mdcEquipmentDto.setFeedbeilv(dto.getFFeed());
- mdcEquipmentDto.setRapidfeed(dto.getRapidfeed());
- mdcEquipmentDto.setNCVersion(dto.getNCVersion());
- mdcEquipmentDto.setTNCVersion(dto.getTNCVersion());
- mdcEquipmentDto.setOPTVersion(dto.getOPTVersion());
- mdcEquipmentDto.setPLCVersion(dto.getPLCVersion());
- }
-
- //鑾峰彇 MDC 椹卞姩瀵瑰簲鐨勫睍绀哄弬鏁� 骞舵牴鎹甼ey 鎷艰浠� workData 鏌ヨ鐨勬暟鎹�
- List<MdcDriveTypeParamConfig> mdcDriveTypeParamList = mdcDriveTypeParamConfigService.getShowDriveParam(mdcEquipment.getDriveType());
- if (mdcDriveTypeParamList != null && !mdcDriveTypeParamList.isEmpty()) {
- for (MdcDriveTypeParamConfig mdcDriveTypeParamConfig : mdcDriveTypeParamList) {
- String englishName = mdcDriveTypeParamConfig.getEnglishName();
- JSONObject jsonObject = (JSONObject) JSONObject.toJSON(dto);
- Object result = jsonObject.get(englishName);
+ //鑾峰彇宸ヤ綔鏁版嵁骞跺垵濮嬪寲
+ String saveTableName = mdcEquipmentDetailedDto.getSaveTableName();
+ Map<String, Object> mapData = equipmentWorkLineService.getDataList(saveTableName);
+ if (mapData != null) {
+ Map<String, Object> runData = new LinkedHashMap<>();
+ //鑾峰彇 MDC 椹卞姩瀵瑰簲鐨勫睍绀哄弬鏁� 骞舵牴鎹甼ey 鎷艰浠� workData 鏌ヨ鐨勬暟鎹�
+ List<MdcDriveTypeParamConfig> mdcDriveTypeParamList = mdcDriveTypeParamConfigService.getShowDriveParam(mdcEquipmentDetailedDto.getDriveType());
+ if (mdcDriveTypeParamList != null && !mdcDriveTypeParamList.isEmpty()) {
+ for (MdcDriveTypeParamConfig mdcDriveTypeParamConfig : mdcDriveTypeParamList) {
+ String englishName = mdcDriveTypeParamConfig.getEnglishName();
+ String chineseName = mdcDriveTypeParamConfig.getChineseName();
+ if (mapData.containsKey(englishName)) {
+ Object object = mapData.get(englishName);
String value = "";
if ("CollectTime".equals(englishName)) {
- Date date = result == null ? null : (Date) result;
+ Date date = object == null ? null : (Date) object;
value = DateUtils.format(date, DateUtils.STR_DATE_TIME_SMALL);
- } else if ("ZUOLAN".equals(mdcEquipment.getDriveType()) && "AI01".equals(englishName) && oporation == 3) {
+ } else if ("ZUOLAN".equals(mdcEquipmentDetailedDto.getDriveType()) && "AI01".equals(englishName) && oporation == 3) {
// ZUOLAN璁惧鐢垫祦瀛楁AI01
value = BigDecimal.valueOf(Math.random() * 15 + 0).setScale(1, RoundingMode.HALF_UP).toString();
- } else if ("ZUOLAN".equals(mdcEquipment.getDriveType()) && "spindlespeed".equals(englishName) && oporation == 3) {
+ } else if ("ZUOLAN".equals(mdcEquipmentDetailedDto.getDriveType()) && "spindlespeed".equals(englishName) && oporation == 3) {
// ZUOLAN璁惧涓昏酱杞�熷瓧娈祍pindlespeed
value = String.valueOf(((new Random().nextInt(35)) + 1) * 100);
- } else if ("ZUOLAN".equals(mdcEquipment.getDriveType()) && "spindleload".equals(englishName) && oporation == 3) {
+ } else if ("ZUOLAN".equals(mdcEquipmentDetailedDto.getDriveType()) && "spindleload".equals(englishName) && oporation == 3) {
// ZUOLAN璁惧涓昏酱璐熻嵎瀛楁spindleload
value = String.valueOf(Integer.valueOf(new Random().nextInt(21)));
- } else if ("ZUOLAN".equals(mdcEquipment.getDriveType()) && "spindlebeilv".equals(englishName) && oporation == 3) {
+ } else if ("ZUOLAN".equals(mdcEquipmentDetailedDto.getDriveType()) && "spindlebeilv".equals(englishName) && oporation == 3) {
// ZUOLAN璁惧涓昏酱鍊嶇巼瀛楁spindlebeilv
value = String.valueOf((new Random().nextInt(13)) * 10);
- } else if ("ZUOLAN".equals(mdcEquipment.getDriveType()) && "feedbeilv".equals(englishName) && oporation == 3) {
+ } else if ("ZUOLAN".equals(mdcEquipmentDetailedDto.getDriveType()) && "feedbeilv".equals(englishName) && oporation == 3) {
// ZUOLAN璁惧杩涚粰鍊嶇巼瀛楁feedbeilv
value = String.valueOf((new Random().nextInt(13)) * 10);
} else if ("spindle_current".equals(englishName)) {
// 鍏朵粬璁惧鐢垫祦瀛楁
- String devicePower = mdcEquipment.getDevicePower();
- Object spindleload = jsonObject.get("spindleload");
+ String devicePower = mdcEquipmentDetailedDto.getDevicePower();
+ Object spindleload = mapData.get("spindleload");
BigDecimal load = spindleload == null ? BigDecimal.ZERO : new BigDecimal(spindleload.toString());
if (StringUtils.isNotEmpty(devicePower) && oporation == 3) {
value = new BigDecimal(devicePower).divide(new BigDecimal("380"), 2, BigDecimal.ROUND_HALF_UP).add(load).toString();
@@ -443,7 +409,7 @@
}
} else if ("torque".equals(englishName)) {
// 鎵煩瀛楁
- MdcTorqueConfig mdcTorqueConfig = mdcTorqueConfigMapper.findLast(mdcEquipment.getEquipmentId());
+ MdcTorqueConfig mdcTorqueConfig = mdcTorqueConfigMapper.findLast(mdcEquipmentDetailedDto.getEquipmentId());
if (mdcTorqueConfig != null) {
value = String.valueOf(mdcTorqueConfig.getTorqueValue());
} else {
@@ -457,7 +423,7 @@
}
} else if ("alarmContent".equals(englishName)) {
if (oporation == 22) {
- List<MdcAlarmInfo> mdcAlarmInfo = mdcAlarmInfoService.list(new LambdaQueryWrapper<MdcAlarmInfo>().eq(MdcAlarmInfo::getDriveType, mdcEquipment.getDriveType()).eq(MdcAlarmInfo::getAlarmCode, equipmentLog.getAlarm()).eq(MdcAlarmInfo::getIsUse, 0));
+ List<MdcAlarmInfo> mdcAlarmInfo = mdcAlarmInfoService.list(new LambdaQueryWrapper<MdcAlarmInfo>().eq(MdcAlarmInfo::getDriveType, mdcEquipmentDetailedDto.getDriveType()).eq(MdcAlarmInfo::getAlarmCode, equipmentLog.getAlarm()).eq(MdcAlarmInfo::getIsUse, 0));
if (mdcAlarmInfo != null && !mdcAlarmInfo.isEmpty()) {
value = mdcAlarmInfo.get(0).getAlarmContent();
}
@@ -465,20 +431,15 @@
value = "鏃�";
}
} else {
- value = result == null ? null : result.toString();
+ value = object == null ? "" : object.toString();
}
- mdcDriveTypeParamConfig.setValue(value);
+ runData.put(chineseName, value);
}
- mdcEquipmentDto.setMdcDriveTypeParamConfigList(mdcDriveTypeParamList);
- }
- EquipmentBaseInfo equipmentBaseInfo = equipmentBaseInfoService.getByEquipmentId(mdcEquipment.getEquipmentId());
- if (equipmentBaseInfo != null) {
- mdcEquipmentDto.setMaxAxis(equipmentBaseInfo.getMaxAxis());
- mdcEquipmentDto.setValidAxis(equipmentBaseInfo.getValidAxis());
}
}
+ result.put("runData", runData);
}
- return mdcEquipmentDto;
+ return result;
}
/**
@@ -861,6 +822,7 @@
/**
* 鏌ヨ鍗曡〃鏁版嵁
+ *
* @param tableName
* @return
*/
--
Gitblit v1.9.3