From 95cef064268b1c13b32111636c267871b54bb24b Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期日, 08 十月 2023 15:51:37 +0800
Subject: [PATCH] 列表设备排序按设备编号正序
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 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 4a9d25f..9dc6fee 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
@@ -70,14 +70,14 @@
private IEquipmentWorkLineService equipmentWorkLineService;
@Resource
private IMdcDriveTypeParamConfigService mdcDriveTypeParamConfigService;
- @Resource
- private XYZAliasesMapper xyzAliasesMapper;
- @Resource
- private IEquipmentXYZService equipmentXYZService;
- @Resource
- private IEquipmentBaseInfoService equipmentBaseInfoService;
- @Resource
- private IEquipmentTemperatureService equipmentTemperatureService;
+// @Resource
+// private XYZAliasesMapper xyzAliasesMapper;
+// @Resource
+// private IEquipmentXYZService equipmentXYZService;
+// @Resource
+// private IEquipmentBaseInfoService equipmentBaseInfoService;
+// @Resource
+// private IEquipmentTemperatureService equipmentTemperatureService;
@Override
public Map<String, String> getDepNamesByEquipmentIds(List<String> equipmentIds) {
@@ -349,10 +349,12 @@
mdcEquipmentDto.setDevicePower(mdcEquipment.getDevicePower());
mdcEquipmentDto.setDeviceType(mdcEquipment.getDriveType());
mdcEquipmentDto.setRemark(mdcEquipment.getRemark());
- mdcEquipmentDto.setEquipmentID(mdcEquipment.getEquipmentId());//璁惧缂栧彿
+ //璁惧缂栧彿
+ mdcEquipmentDto.setEquipmentID(mdcEquipment.getEquipmentId());
mdcEquipmentDto.setEquipmentName(mdcEquipment.getEquipmentName());
mdcEquipmentDto.setEquipmentIP(mdcEquipment.getEquipmentIp());
- mdcEquipmentDto.setEquipmentModel(mdcEquipment.getEquipmentModel());//璁惧鍨嬪彿
+ //璁惧鍨嬪彿
+ mdcEquipmentDto.setEquipmentModel(mdcEquipment.getEquipmentModel());
mdcEquipmentDto.setDriveType(mdcEquipment.getDriveType());
mdcEquipmentDto.setDataPort(mdcEquipment.getDataPort());
mdcEquipmentDto.setDataFlag(Integer.parseInt(CommonConstant.STATUS_1));
--
Gitblit v1.9.3