From b88a288f4f787b509463678e3cd9ccfa3f37014b Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期三, 11 三月 2026 12:01:05 +0800
Subject: [PATCH] 导入测试
---
service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnerCarsCmd.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 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 99417c0..c9021bc 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,13 +6,12 @@
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.IMachineTranslateInnerServiceSMO;
import com.java110.intf.common.IMachineTranslateV1InnerServiceSMO;
import com.java110.intf.community.IMenuInnerServiceSMO;
import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
@@ -22,6 +21,7 @@
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.ListUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -54,9 +54,10 @@
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+ super.validateProperty(cmdDataFlowContext);
Assert.jsonObjectHaveKey(reqJson, "page", "璇锋眰涓湭鍖呭惈page淇℃伅");
Assert.jsonObjectHaveKey(reqJson, "row", "璇锋眰涓湭鍖呭惈row淇℃伅");
- Assert.jsonObjectHaveKey(reqJson, "communityId", "璇锋眰涓湭鍖呭惈communityId淇℃伅");
+ Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰涓湭鍖呭惈communityId淇℃伅");
Assert.isInteger(reqJson.getString("page"), "涓嶆槸鏈夋晥鏁板瓧");
Assert.isInteger(reqJson.getString("row"), "涓嶆槸鏈夋晥鏁板瓧");
}
@@ -70,7 +71,7 @@
parkingSpaceDto.setNum(reqJson.getString("num"));
parkingSpaceDto.setCommunityId(reqJson.getString("communityId"));
List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
- if (parkingSpaceDtos == null || parkingSpaceDtos.size() < 1) {
+ if (ListUtil.isNull(parkingSpaceDtos)) {
ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(1, 1, new JSONArray());
cmdDataFlowContext.setResponseEntity(responseEntity);
return;
@@ -89,7 +90,7 @@
if (total > 0) {
ownerCarDtoList = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
//灏忓尯20鏉℃椂鍒锋埧灞嬪拰杞︿綅淇℃伅
- if (row < 20) {
+ if (row < 21) {
freshPs(ownerCarDtoList);
freshRoomInfo(ownerCarDtoList);
//鍒峰叆鍚屾鐗╄仈缃戠姸鎬�
@@ -106,6 +107,13 @@
privileges = menuInnerServiceSMOImpl.checkUserHasResource(basePrivilegeDto);
if (privileges == null || privileges.size() == 0) {
for (OwnerCarDto tmpOwnerCarDto : ownerCarDtoList) {
+ switch (tmpOwnerCarDto.getCarTypeCd()) {
+ case "R" : tmpOwnerCarDto.setLeaseTypeName("绉熷杞�");break;
+ case "I" : tmpOwnerCarDto.setLeaseTypeName("涓氬浼氱収椤捐溅");break;
+ case "NM" : tmpOwnerCarDto.setLeaseTypeName("灏忓尯涓氫富浜ф潈杞�");break;
+ case "SP" : tmpOwnerCarDto.setLeaseTypeName("鍟嗛摵杞�");break;
+ case "H" : tmpOwnerCarDto.setLeaseTypeName("鏈堢杞�");break;
+ }
String link = tmpOwnerCarDto.getLink();
if (!StringUtil.isEmpty(link)) {
link = link.substring(0, 3) + "****" + link.substring(7);
@@ -198,7 +206,7 @@
ownerRoomRelDto.setPage(1);
ownerRoomRelDto.setRow(3); //鍙睍绀�3涓埧灞嬩互鍐� 涓嶇劧椤甸潰澶贡
List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
- if (ownerRoomRelDtos == null || ownerRoomRelDtos.size() < 1) {
+ if (ListUtil.isNull(ownerRoomRelDtos)) {
ownerCarDto.setRoomName("-");
return;
}
@@ -212,7 +220,7 @@
List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
String roomName = "";
for (RoomDto tRoomDto : roomDtos) {
- roomName += (tRoomDto.getFloorNum() + "鏍�" + tRoomDto.getUnitNum() + "鍗曞厓" + tRoomDto.getRoomNum() + "瀹�" + "/");
+ roomName += (tRoomDto.getFloorNum() + "-" + tRoomDto.getUnitNum() + "-" + tRoomDto.getRoomNum() + "/");
}
roomName = roomName.endsWith("/") ? roomName.substring(0, roomName.length() - 1) : roomName;
ownerCarDto.setRoomName(roomName);
--
Gitblit v1.8.0