diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMallBuildingController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMallBuildingController.java index 38e652982..c5c22dc42 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMallBuildingController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMallBuildingController.java @@ -70,6 +70,12 @@ public class WxMallBuildingController extends BaseController return wxMallBuildingService.getbuildinglist(getTenantId()); } + @ApiOperation("获取楼层楼座数据") + @GetMapping("getbuildingfloorlist") + public ResultData getbuildingfloorlist() { + return wxMallBuildingService.getbuildingfloorlist(getTenantId()); + } + } diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMallBuilding.java b/mallinkService/src/main/java/com/simple/domain/po/WxMallBuilding.java index 8cb95aae2..69bb67348 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMallBuilding.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMallBuilding.java @@ -1,12 +1,11 @@ package com.simple.domain.po; -import javax.persistence.*; -import java.util.*; -import java.math.*; -import javax.persistence.Transient; -import java.util.List; import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; +import java.util.Date; +import java.util.List; @Table(name = "wx_mall_building") public class WxMallBuilding implements Serializable { @@ -38,9 +37,11 @@ public class WxMallBuilding implements Serializable { public void setIds(List ids) { this.ids = ids; } - - - + + @Transient + protected List floors; + + /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -96,7 +97,13 @@ public class WxMallBuilding implements Serializable { updateDate = _updateDate; } + public List getFloors() { + return floors; + } + public void setFloors(List floors) { + this.floors = floors; + } public static enum Field { diff --git a/mallinkService/src/main/java/com/simple/service/WxMallBuildingService.java b/mallinkService/src/main/java/com/simple/service/WxMallBuildingService.java index 43b63c037..d43f0592c 100644 --- a/mallinkService/src/main/java/com/simple/service/WxMallBuildingService.java +++ b/mallinkService/src/main/java/com/simple/service/WxMallBuildingService.java @@ -42,4 +42,6 @@ public interface WxMallBuildingService { ResultData getbuildinglist(String tenantId); + ResultData getbuildingfloorlist(String tenantId); + } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMallBuildingServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMallBuildingServiceImpl.java index 050f56a37..8b31933c4 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMallBuildingServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMallBuildingServiceImpl.java @@ -1,15 +1,19 @@ package com.simple.service.impl; -import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.simple.common.IdWorker; import com.simple.common.ResultData; import com.simple.domain.po.WxMallBuilding; +import com.simple.domain.po.WxMallFloor; import com.simple.mapper.WxMallBuildingMapper; +import com.simple.mapper.WxMallFloorMapper; import com.simple.service.WxMallBuildingService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.simple.common.IdWorker; + +import java.util.List; +import java.util.stream.Collectors; @Service public class WxMallBuildingServiceImpl implements WxMallBuildingService { @@ -17,6 +21,8 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { @Autowired WxMallBuildingMapper wxMallBuildingMapper; + @Autowired + WxMallFloorMapper wxMallFloorMapper; @Override public PageInfo listAsPage(WxMallBuilding record, Integer pageIndex, Integer pageSize) { @@ -53,5 +59,33 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { return new ResultData(list); } + @Override + public ResultData getbuildingfloorlist(String tenantId) { + WxMallBuilding wxMallBuilding = new WxMallBuilding(); + wxMallBuilding.setTenantId(tenantId); + List buildings = wxMallBuildingMapper.findList(wxMallBuilding); + List wxMallBuildings = buildings.stream().map(b -> { + WxMallBuilding tempb = new WxMallBuilding(); + tempb.setId(b.getId()); + tempb.setName(b.getName()); + return tempb; + }).collect(Collectors.toList()); + + for(WxMallBuilding building:wxMallBuildings){ + WxMallFloor wxMallFloor = new WxMallFloor(); + wxMallFloor.setBuildingId(building.getId()); + List wxMallFloors = wxMallFloorMapper.findList(wxMallFloor).stream().map(f -> { + WxMallFloor tempf = new WxMallFloor(); + tempf.setId(f.getId()); + tempf.setFloorName(f.getFloorName()); + return tempf; + }).collect(Collectors.toList()); + building.setFloors(wxMallFloors); + + } + + return new ResultData(wxMallBuildings); + } + }