java110 лет назад: 5
Родитель
Сommit
f82a86fb55

+ 12 - 0
java110-bean/src/main/java/com/java110/vo/api/parkingArea/ApiParkingAreaDataVo.java

@@ -1,7 +1,10 @@
 package com.java110.vo.api.parkingArea;
 
+import com.java110.dto.parkingAreaAttr.ParkingAreaAttrDto;
+
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 public class ApiParkingAreaDataVo implements Serializable {
 
@@ -9,6 +12,7 @@ public class ApiParkingAreaDataVo implements Serializable {
     private String num;
     private String typeCd;
     private String remark;
+    private List<ParkingAreaAttrDto> attrs;
 
     private String createTime;
 
@@ -51,4 +55,12 @@ public class ApiParkingAreaDataVo implements Serializable {
     public void setCreateTime(String createTime) {
         this.createTime = createTime;
     }
+
+    public List<ParkingAreaAttrDto> getAttrs() {
+        return attrs;
+    }
+
+    public void setAttrs(List<ParkingAreaAttrDto> attrs) {
+        this.attrs = attrs;
+    }
 }

+ 12 - 1
service-api/src/main/java/com/java110/api/listener/parkingArea/ListParkingAreasListener.java

@@ -4,12 +4,14 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.api.listener.AbstractServiceApiListener;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
+import com.java110.dto.community.CommunityDto;
 import com.java110.intf.community.IParkingAreaInnerServiceSMO;
 import com.java110.dto.parking.ParkingAreaDto;
 import com.java110.core.event.service.api.ServiceDataFlowEvent;
 import com.java110.utils.constant.ServiceCodeParkingAreaConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.api.community.ApiCommunityDataVo;
 import com.java110.vo.api.parkingArea.ApiParkingAreaDataVo;
 import com.java110.vo.api.parkingArea.ApiParkingAreaVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -69,9 +71,18 @@ public class ListParkingAreasListener extends AbstractServiceApiListener {
         int count = parkingAreaInnerServiceSMOImpl.queryParkingAreasCount(parkingAreaDto);
 
         List<ApiParkingAreaDataVo> parkingAreas = null;
+        ApiParkingAreaDataVo parkingAreaDataVo = null;
+        List<ParkingAreaDto> parkingAreaDtos = null;
 
         if (count > 0) {
-            parkingAreas = BeanConvertUtil.covertBeanList(parkingAreaInnerServiceSMOImpl.queryParkingAreas(parkingAreaDto), ApiParkingAreaDataVo.class);
+            parkingAreas = new ArrayList<>();
+            parkingAreaDtos = parkingAreaInnerServiceSMOImpl.queryParkingAreas(parkingAreaDto);
+
+            for (ParkingAreaDto tmpParkingAreaDto : parkingAreaDtos) {
+                parkingAreaDataVo = BeanConvertUtil.covertBean(tmpParkingAreaDto, ApiParkingAreaDataVo.class);
+                parkingAreaDataVo.setAttrs(tmpParkingAreaDto.getAttrs());
+                parkingAreas.add(parkingAreaDataVo);
+            }
         } else {
             parkingAreas = new ArrayList<>();
         }