Просмотр исходного кода

[商铺商户][修改]:获取楼层楼座数据

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
e5bc0722f9
4 измененных файлов: 59 добавлений и 10 удалений
  1. +6
    -0
      mallinkAdmin/src/main/java/com/simple/controller/WxMallBuildingController.java
  2. +15
    -8
      mallinkService/src/main/java/com/simple/domain/po/WxMallBuilding.java
  3. +2
    -0
      mallinkService/src/main/java/com/simple/service/WxMallBuildingService.java
  4. +36
    -2
      mallinkService/src/main/java/com/simple/service/impl/WxMallBuildingServiceImpl.java

+ 6
- 0
mallinkAdmin/src/main/java/com/simple/controller/WxMallBuildingController.java Просмотреть файл

@@ -70,6 +70,12 @@ public class WxMallBuildingController extends BaseController
return wxMallBuildingService.getbuildinglist(getTenantId()); return wxMallBuildingService.getbuildinglist(getTenantId());
} }


@ApiOperation("获取楼层楼座数据")
@GetMapping("getbuildingfloorlist")
public ResultData getbuildingfloorlist() {
return wxMallBuildingService.getbuildingfloorlist(getTenantId());
}





} }

+ 15
- 8
mallinkService/src/main/java/com/simple/domain/po/WxMallBuilding.java Просмотреть файл

@@ -1,12 +1,11 @@
package com.simple.domain.po; 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.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
import java.util.List;


@Table(name = "wx_mall_building") @Table(name = "wx_mall_building")
public class WxMallBuilding implements Serializable { public class WxMallBuilding implements Serializable {
@@ -38,9 +37,11 @@ public class WxMallBuilding implements Serializable {
public void setIds(List<String> ids) { public void setIds(List<String> ids) {
this.ids = ids; this.ids = ids;
} }

@Transient
protected List<WxMallFloor> floors;


/*租户ID**/ /*租户ID**/
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId; private String tenantId;
@@ -96,7 +97,13 @@ public class WxMallBuilding implements Serializable {
updateDate = _updateDate; updateDate = _updateDate;
} }


public List<WxMallFloor> getFloors() {
return floors;
}


public void setFloors(List<WxMallFloor> floors) {
this.floors = floors;
}


public static enum Field public static enum Field
{ {


+ 2
- 0
mallinkService/src/main/java/com/simple/service/WxMallBuildingService.java Просмотреть файл

@@ -42,4 +42,6 @@ public interface WxMallBuildingService {


ResultData getbuildinglist(String tenantId); ResultData getbuildinglist(String tenantId);


ResultData getbuildingfloorlist(String tenantId);

} }

+ 36
- 2
mallinkService/src/main/java/com/simple/service/impl/WxMallBuildingServiceImpl.java Просмотреть файл

@@ -1,15 +1,19 @@
package com.simple.service.impl; package com.simple.service.impl;


import java.util.*;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.simple.common.IdWorker;
import com.simple.common.ResultData; import com.simple.common.ResultData;
import com.simple.domain.po.WxMallBuilding; import com.simple.domain.po.WxMallBuilding;
import com.simple.domain.po.WxMallFloor;
import com.simple.mapper.WxMallBuildingMapper; import com.simple.mapper.WxMallBuildingMapper;
import com.simple.mapper.WxMallFloorMapper;
import com.simple.service.WxMallBuildingService; import com.simple.service.WxMallBuildingService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.simple.common.IdWorker;

import java.util.List;
import java.util.stream.Collectors;


@Service @Service
public class WxMallBuildingServiceImpl implements WxMallBuildingService { public class WxMallBuildingServiceImpl implements WxMallBuildingService {
@@ -17,6 +21,8 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService {
@Autowired @Autowired
WxMallBuildingMapper wxMallBuildingMapper; WxMallBuildingMapper wxMallBuildingMapper;


@Autowired
WxMallFloorMapper wxMallFloorMapper;


@Override @Override
public PageInfo<WxMallBuilding> listAsPage(WxMallBuilding record, Integer pageIndex, Integer pageSize) { public PageInfo<WxMallBuilding> listAsPage(WxMallBuilding record, Integer pageIndex, Integer pageSize) {
@@ -53,5 +59,33 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService {
return new ResultData(list); return new ResultData(list);
} }


@Override
public ResultData getbuildingfloorlist(String tenantId) {
WxMallBuilding wxMallBuilding = new WxMallBuilding();
wxMallBuilding.setTenantId(tenantId);
List<WxMallBuilding> buildings = wxMallBuildingMapper.findList(wxMallBuilding);
List<WxMallBuilding> 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<WxMallFloor> 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);
}



} }

Загрузка…
Отмена
Сохранить