From 3fe2aea7827eafc7513159db9a337fdf567584c8 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 08 五月 2023 01:21:13 +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 | 48 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 45 insertions(+), 3 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 0e852b2..9a844cd
--- 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
@@ -3,13 +3,16 @@
import com.java110.common.dao.IMachineServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.core.smo.hardwareAdapation.IMachineInnerServiceSMO;
-import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.demo.DemoDto;
-import com.java110.dto.hardwareAdapation.MachineDto;
+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,35 @@
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());
+ machineAttrDto.setDomain(machineDto.getDomain());
+ 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;
}
@@ -84,6 +119,13 @@
return machineServiceDaoImpl.queryMachinesCount(BeanConvertUtil.beanCovertMap(machineDto));
}
+ @Override
+ public int updateMachineState(@RequestBody MachineDto machineDto) {
+ machineServiceDaoImpl.updateMachineInfoInstance(BeanConvertUtil.beanCovertMap(machineDto));
+
+ return 1;
+ }
+
public IMachineServiceDao getMachineServiceDaoImpl() {
return machineServiceDaoImpl;
}
--
Gitblit v1.8.0