From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-common/src/main/java/com/java110/common/smo/impl/MachineInnerServiceSMOImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/MachineInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/MachineInnerServiceSMOImpl.java
old mode 100644
new mode 100755
index df3ec17..5f18050
--- a/service-common/src/main/java/com/java110/common/smo/impl/MachineInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/MachineInnerServiceSMOImpl.java
@@ -12,6 +12,7 @@
import com.java110.intf.common.IMachineInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@@ -64,6 +65,7 @@
MachineAttrDto machineAttrDto = new MachineAttrDto();
machineAttrDto.setMachineIds(machineIds.toArray(new String[machineIds.size()]));
machineAttrDto.setCommunityId(machines.get(0).getCommunityId());
+ machineAttrDto.setDomain(machineDto.getDomain());
List<MachineAttrDto> machineAttrDtos = machineAttrInnerServiceSMOImpl.queryMachineAttrs(machineAttrDto);
List<MachineAttrDto> tMachineAttrDtos = null;
@@ -71,8 +73,16 @@
tMachineAttrDtos = new ArrayList<>();
for (MachineAttrDto tMachineAttrDto : machineAttrDtos) {
- if (tMachineDto.getMachineId().equals(tMachineAttrDto.getMachineId())) {
- tMachineAttrDtos.add(tMachineAttrDto);
+ if (StringUtil.isEmpty(tMachineAttrDto.getValueName())) {
+ tMachineAttrDto.setValueName(tMachineAttrDto.getValue());
+ }
+ if (!tMachineDto.getMachineId().equals(tMachineAttrDto.getMachineId())) {
+ continue;
+ }
+ tMachineAttrDtos.add(tMachineAttrDto);
+ //todo 鍒峰叆鍗忚
+ if(MachineAttrDto.SPEC_HM.equals(tMachineAttrDto.getSpecCd())){
+ tMachineDto.setHmId(tMachineAttrDto.getValue());
}
}
tMachineDto.setMachineAttrs(tMachineAttrDtos);
--
Gitblit v1.8.0