From bd2e96414fbce1efe7578268b565de232f76982c Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 23 一月 2020 21:24:31 +0800
Subject: [PATCH] 加入车辆进场
---
HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/smo/impl/MachineInnerServiceSMOImpl.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/smo/impl/MachineInnerServiceSMOImpl.java b/HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/smo/impl/MachineInnerServiceSMOImpl.java
index 209f68b..e8a391d 100644
--- a/HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/smo/impl/MachineInnerServiceSMOImpl.java
+++ b/HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/smo/impl/MachineInnerServiceSMOImpl.java
@@ -5,6 +5,8 @@
import com.java110.core.smo.hardwareAdapation.IMachineInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
+import com.java110.dto.user.UserDto;
+import com.java110.dto.demo.DemoDto;
import com.java110.dto.hardwareAdapation.MachineDto;
import com.java110.hardwareAdapation.dao.IMachineServiceDao;
import com.java110.utils.util.BeanConvertUtil;
@@ -12,6 +14,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -44,10 +47,38 @@
List<MachineDto> machines = BeanConvertUtil.covertBeanList(machineServiceDaoImpl.getMachineInfo(BeanConvertUtil.beanCovertMap(machineDto)), MachineDto.class);
-
return machines;
}
+ /**
+ * 鑾峰彇鎵归噺userId
+ *
+ * @param demos 灏忓尯妤间俊鎭�
+ * @return 鎵归噺userIds 淇℃伅
+ */
+ private String[] getUserIds(List<DemoDto> demos) {
+ List<String> userIds = new ArrayList<String>();
+ for (DemoDto demo : demos) {
+ userIds.add(demo.getUserId());
+ }
+
+ return userIds.toArray(new String[userIds.size()]);
+ }
+
+ /**
+ * 浠庣敤鎴峰垪琛ㄤ腑鏌ヨ鐢ㄦ埛锛屽皢鐢ㄦ埛涓殑淇℃伅 鍒锋柊鍒� floor瀵硅薄涓�
+ *
+ * @param demo 灏忓尯demo淇℃伅
+ * @param users 鐢ㄦ埛鍒楄〃
+ */
+ private void refreshDemo(DemoDto demo, List<UserDto> users) {
+ for (UserDto user : users) {
+ if (demo.getUserId().equals(user.getUserId())) {
+ BeanConvertUtil.covertBean(user, demo);
+ }
+ }
+ }
+
@Override
public int queryMachinesCount(@RequestBody MachineDto machineDto) {
return machineServiceDaoImpl.queryMachinesCount(BeanConvertUtil.beanCovertMap(machineDto));
--
Gitblit v1.8.0