From 093b73aadb022895a02dbbcd64b87613e19b547b Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期一, 10 一月 2022 18:05:21 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-common/src/main/java/com/java110/common/smo/impl/MachineInnerServiceSMOImpl.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 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 ad8915a..c66913e
--- 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
@@ -5,11 +5,14 @@
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.demo.DemoDto;
+import com.java110.dto.machine.MachineAttrDto;
import com.java110.dto.machine.MachineDto;
import com.java110.dto.user.UserDto;
+import com.java110.intf.common.IMachineAttrInnerServiceSMO;
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;
@@ -32,6 +35,9 @@
private IMachineServiceDao machineServiceDaoImpl;
@Autowired
+ private IMachineAttrInnerServiceSMO machineAttrInnerServiceSMOImpl;
+
+ @Autowired
private IUserInnerServiceSMO userInnerServiceSMOImpl;
@Override
@@ -47,6 +53,34 @@
List<MachineDto> machines = BeanConvertUtil.covertBeanList(machineServiceDaoImpl.getMachineInfo(BeanConvertUtil.beanCovertMap(machineDto)), MachineDto.class);
+ if (machines == null || machines.size() < 1) {
+ return machines;
+ }
+
+ List<String> machineIds = new ArrayList<>();
+
+ for (MachineDto tMachineDto : machines) {
+ machineIds.add(tMachineDto.getMachineId());
+ }
+ MachineAttrDto machineAttrDto = new MachineAttrDto();
+ machineAttrDto.setMachineIds(machineIds.toArray(new String[machineIds.size()]));
+ machineAttrDto.setCommunityId(machines.get(0).getCommunityId());
+ List<MachineAttrDto> machineAttrDtos = machineAttrInnerServiceSMOImpl.queryMachineAttrs(machineAttrDto);
+
+ List<MachineAttrDto> tMachineAttrDtos = null;
+ for (MachineDto tMachineDto : machines) {
+ tMachineAttrDtos = new ArrayList<>();
+
+ for (MachineAttrDto tMachineAttrDto : machineAttrDtos) {
+ if (StringUtil.isEmpty(tMachineAttrDto.getValueName())) {
+ tMachineAttrDto.setValueName(tMachineAttrDto.getValue());
+ }
+ if (tMachineDto.getMachineId().equals(tMachineAttrDto.getMachineId())) {
+ tMachineAttrDtos.add(tMachineAttrDto);
+ }
+ }
+ tMachineDto.setMachineAttrs(tMachineAttrDtos);
+ }
return machines;
}
--
Gitblit v1.8.0