From 9e6e6a4620000b8a56c4323f34156e789156d89a Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 08 十二月 2023 10:26:08 +0800
Subject: [PATCH] 设备监控设备详细信息调整LSV2
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 9 +++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java | 19 +++++++++++++++++++
2 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java
index 6beaab2..8d85fc5 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java
@@ -158,20 +158,33 @@
* lsv2
*/
//鎿嶄綔妯″紡
+ @JSONField(name = "OperationType")
private String operationType;
//褰撳墠绋嬪簭
private String program;
//绋嬪簭鎵ц鐐�
+ @JSONField(name = "ProgramPosition")
private String programPosition;
//蹇�熻繘缁欏�嶇巼
+ @JSONField(name = "Rapidfeed")
private String rapidfeed;
//绗竴涓敊璇彿
+ @JSONField(name = "FirstErrorNum")
private String firstErrorNum;
//绗竴涓敊璇�
+ @JSONField(name = "FirstError")
private String firstError;
//绗簩涓敊璇彿
+ @JSONField(name = "SecondErrorNum")
private String secondErrorNum;
+ //杩涚粰鍊嶇巼
+ @JSONField(name = "Ffeed")
+ private String fFeed;
+ //涓昏酱鍊嶇巼
+ @JSONField(name = "Sfeed")
+ private String sFeed;
//绗簩涓敊璇�
+ @JSONField(name = "SecondError")
private String secondError;
//X鍧愭爣
private String x;
@@ -186,16 +199,22 @@
//C鍧愭爣
private String c;
//閿欒淇℃伅
+ @JSONField(name = "Errorinfo")
private String errorinfo;
//璁惧淇℃伅
+ @JSONField(name = "Equipmentinfo")
private String equipmentinfo;
//鍩虹淇℃伅
+ @JSONField(name = "Basicinfo")
private String basicinfo;
//棰勮鏁版嵁
+ @JSONField(name = "Preinstall")
private String preinstall;
//NC姝ｅ父杩愯鏃堕棿
+ @JSONField(name = "NCNormalTime")
private String nCNormalTime;
//璁惧姝ｅ父杩愯鏃堕棿
+ @JSONField(name = "EquipmentNormalTime")
private String equipmentNormalTime;
// 璁惧ID
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 a4c2b51..0a74de7 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
@@ -372,6 +372,15 @@
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());
--
Gitblit v1.9.3