From 0fea532b07be89978343cb4aede3693af99f5656 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 25 七月 2023 23:04:41 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnerCarsCmd.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnerCarsCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnerCarsCmd.java
index 300a225..fb67476 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnerCarsCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnerCarsCmd.java
@@ -6,11 +6,13 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.dto.RoomDto;
-import com.java110.dto.basePrivilege.BasePrivilegeDto;
+import com.java110.dto.room.RoomDto;
+import com.java110.dto.privilege.BasePrivilegeDto;
+import com.java110.dto.machine.MachineTranslateDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.dto.parking.ParkingSpaceDto;
+import com.java110.intf.common.IMachineTranslateV1InnerServiceSMO;
import com.java110.intf.community.IMenuInnerServiceSMO;
import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
@@ -45,6 +47,9 @@
@Autowired
private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
+
+ @Autowired
+ private IMachineTranslateV1InnerServiceSMO machineTranslateV1InnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
@@ -86,6 +91,8 @@
if (row < 20) {
freshPs(ownerCarDtoList);
freshRoomInfo(ownerCarDtoList);
+ //鍒峰叆鍚屾鐗╄仈缃戠姸鎬�
+ freshTransactionIotState(ownerCarDtoList);
}
} else {
ownerCarDtoList = new ArrayList<>();
@@ -107,6 +114,39 @@
}
ResponseEntity<String> responseEntity = ResultVo.createResponseEntity((int) Math.ceil((double) total / (double) row), total, ownerCarDtoList);
cmdDataFlowContext.setResponseEntity(responseEntity);
+ }
+
+ private void freshTransactionIotState(List<OwnerCarDto> ownerCarDtoList) {
+ if (ownerCarDtoList == null || ownerCarDtoList.size() < 1) {
+ return;
+ }
+ List<String> memberIds = new ArrayList<>();
+ for (OwnerCarDto ownerCarDto : ownerCarDtoList) {
+ if (StringUtil.isEmpty(ownerCarDto.getPsId())) {
+ continue;
+ }
+ memberIds.add(ownerCarDto.getMemberId());
+ }
+
+ MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
+ machineTranslateDto.setObjIds(memberIds.toArray(new String[memberIds.size()]));
+ List<MachineTranslateDto> machineTranslateDtos = machineTranslateV1InnerServiceSMOImpl.queryObjStateInMachineTranslates(machineTranslateDto);
+
+ if (machineTranslateDtos == null || machineTranslateDtos.size() < 1) {
+ return;
+ }
+
+ for (OwnerCarDto ownerCarDto : ownerCarDtoList) {
+ for (MachineTranslateDto tmpMachineTranslateDto : machineTranslateDtos) {
+ if (!ownerCarDto.getMemberId().equals(tmpMachineTranslateDto.getObjId())) {
+ continue;
+ }
+ ownerCarDto.setIotStateName(tmpMachineTranslateDto.getStateName());
+ ownerCarDto.setIotRemark(tmpMachineTranslateDto.getRemark());
+ }
+ }
+
+
}
private void freshPs(List<OwnerCarDto> ownerCarDtoList) {
@@ -154,6 +194,8 @@
private void doFreshRoomInfo(OwnerCarDto ownerCarDto) {
OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
ownerRoomRelDto.setOwnerId(ownerCarDto.getOwnerId());
+ ownerRoomRelDto.setPage(1);
+ ownerRoomRelDto.setRow(3); //鍙睍绀�3涓埧灞嬩互鍐� 涓嶇劧椤甸潰澶贡
List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
if (ownerRoomRelDtos == null || ownerRoomRelDtos.size() < 1) {
ownerCarDto.setRoomName("-");
--
Gitblit v1.8.0