From 372ac7412cc0b02bbd08730bbb4152f3af32a9d2 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 26 一月 2023 02:11:30 +0800
Subject: [PATCH] 优化代码

---
 service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnerCarsCmd.java |   25 +++++--------------------
 1 files changed, 5 insertions(+), 20 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 0fc0bc3..be3f019 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
@@ -4,7 +4,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+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;
@@ -28,8 +28,8 @@
 import java.util.List;
 import java.util.Map;
 
-@Java110Cmd(serviceCode = "/owner.queryOwnerCars")
-public class QueryOwnerCarsCmd extends AbstractServiceCmdListener {
+@Java110Cmd(serviceCode = "owner.queryOwnerCars")
+public class QueryOwnerCarsCmd extends Cmd {
 
     @Autowired
     private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
@@ -58,7 +58,6 @@
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
         int row = reqJson.getInteger("row");
-
         if (reqJson.containsKey("num") && !StringUtil.isEmpty(reqJson.getString("num"))) {
             ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
             parkingSpaceDto.setAreaNum(reqJson.getString("areaNum"));
@@ -70,7 +69,6 @@
                 cmdDataFlowContext.setResponseEntity(responseEntity);
                 return;
             }
-
             reqJson.put("psId", parkingSpaceDtos.get(0).getPsId());
         }
         OwnerCarDto ownerCarDto = BeanConvertUtil.covertBean(reqJson, OwnerCarDto.class);
@@ -78,15 +76,12 @@
             ownerCarDto.setCarTypeCd("");
             ownerCarDto.setCarTypeCds(reqJson.getString("carTypeCds").split(","));
         }
-
         //鏌ヨ鎬昏褰曟暟
         int total = ownerCarInnerServiceSMOImpl.queryOwnerCarsCount(ownerCarDto);
 //        int count = 0;
         List<OwnerCarDto> ownerCarDtoList = null;
-
         if (total > 0) {
             ownerCarDtoList = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
-
             //灏忓尯20鏉℃椂鍒锋埧灞嬪拰杞︿綅淇℃伅
             if (row < 20) {
                 freshPs(ownerCarDtoList);
@@ -110,17 +105,14 @@
                 }
             }
         }
-
         ResponseEntity<String> responseEntity = ResultVo.createResponseEntity((int) Math.ceil((double) total / (double) row), total, ownerCarDtoList);
         cmdDataFlowContext.setResponseEntity(responseEntity);
     }
 
     private void freshPs(List<OwnerCarDto> ownerCarDtoList) {
-
         if (ownerCarDtoList == null || ownerCarDtoList.size() < 1) {
             return;
         }
-
         List<String> psIds = new ArrayList<>();
         for (OwnerCarDto ownerCarDto : ownerCarDtoList) {
             if (StringUtil.isEmpty(ownerCarDto.getPsId())) {
@@ -128,12 +120,10 @@
             }
             psIds.add(ownerCarDto.getPsId());
         }
-
         ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
         parkingSpaceDto.setCommunityId(ownerCarDtoList.get(0).getCommunityId());
         parkingSpaceDto.setPsIds(psIds.toArray(new String[psIds.size()]));
         List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
-
         for (ParkingSpaceDto tmpParkingSpaceDto : parkingSpaceDtos) {
             for (OwnerCarDto ownerCarDto : ownerCarDtoList) {
                 if (tmpParkingSpaceDto.getPsId().equals(ownerCarDto.getPsId())) {
@@ -151,12 +141,9 @@
      * @param ownerCarDtos
      */
     private void freshRoomInfo(List<OwnerCarDto> ownerCarDtos) {
-
         for (OwnerCarDto ownerCarDto : ownerCarDtos) {
-
             doFreshRoomInfo(ownerCarDto);
         }
-
     }
 
     /**
@@ -167,18 +154,17 @@
     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("-");
             return;
         }
-
         List<String> roomIds = new ArrayList<>();
         for (OwnerRoomRelDto tOwnerRoomRelDto : ownerRoomRelDtos) {
             roomIds.add(tOwnerRoomRelDto.getRoomId());
         }
-
         RoomDto roomDto = new RoomDto();
         roomDto.setCommunityId(ownerCarDto.getCommunityId());
         roomDto.setRoomIds(roomIds.toArray(new String[roomIds.size()]));
@@ -187,7 +173,6 @@
         for (RoomDto tRoomDto : roomDtos) {
             roomName += (tRoomDto.getFloorNum() + "鏍�" + tRoomDto.getUnitNum() + "鍗曞厓" + tRoomDto.getRoomNum() + "瀹�" + "/");
         }
-
         roomName = roomName.endsWith("/") ? roomName.substring(0, roomName.length() - 1) : roomName;
         ownerCarDto.setRoomName(roomName);
     }

--
Gitblit v1.8.0