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

[需求][1000186]:添加项目信息的详细信息接口

release_toaliyun_real
hupeng 7 лет назад
Родитель
Сommit
a5fc2911e9
5 измененных файлов: 70 добавлений и 8 удалений
  1. +7
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/WxMallController.java
  2. +11
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMall.java
  3. +4
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java
  4. +1
    -2
      mallinkService/src/main/java/com/iformall/service/WxMallService.java
  5. +47
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java

+ 7
- 0
mallinkAdmin/src/main/java/com/iformall/controller/WxMallController.java Просмотреть файл

@@ -68,6 +68,13 @@ public class WxMallController extends BaseController {
return new ResultData(Result.SUCCESS, "查询成功", wxMallService.getById(id));
}

@ApiOperation("根据id查询接口")
@GetMapping("/mallinfoExt")
public ResultData mallinfoExt() {
logger.debug("[" + getIpAddr() + "] WxMallController::mallinfoExt");
return new ResultData(wxMallService.getByTenantIdExt(getTenantId()));
}

@ApiOperation("查询当前mall的信息")
@GetMapping("/mallinfo")
public ResultData mallinfo() {


+ 11
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMall.java Просмотреть файл

@@ -85,6 +85,9 @@ public class WxMall implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="小程序提示",name="weapNote")
private String weapNote;

@Transient
protected List<WxMallBuilding> buildings;

public String getTenantId() {
return tenantId;
}
@@ -184,6 +187,14 @@ public class WxMall implements Serializable {
this.weapNote = weapNote;
}

public List<WxMallBuilding> getBuildings() {
return buildings;
}

public void setBuildings(List<WxMallBuilding> buildings) {
this.buildings = buildings;
}

public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")


+ 4
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java Просмотреть файл

@@ -61,6 +61,10 @@ public class WxMallFloor implements Serializable {
/*更新时间**/
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
private Date updateDate;

@Transient
protected List<WxMallFloor> floors;

public String getTenantId() {
return tenantId;
}
@@ -105,7 +109,6 @@ public class WxMallFloor implements Serializable {
}



public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")


+ 1
- 2
mallinkService/src/main/java/com/iformall/service/WxMallService.java Просмотреть файл

@@ -43,9 +43,8 @@ public interface WxMallService {
* @param id
*/
WxMall getByTenantId(String id);

WxMall getByTenantIdExt(String id);


+ 47
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java Просмотреть файл

@@ -3,7 +3,12 @@ package com.iformall.service.impl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxMall;
import com.iformall.domain.po.WxMallBuilding;
import com.iformall.domain.po.WxMallFloor;
import com.iformall.mapper.WxMallBuildingMapper;
import com.iformall.mapper.WxMallFloorMapper;
import com.iformall.mapper.WxMallMapper;
import com.iformall.service.WxMallBuildingService;
import com.iformall.service.WxMallService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -11,6 +16,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker;

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

@Service
public class WxMallServiceImpl implements WxMallService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -18,6 +26,11 @@ public class WxMallServiceImpl implements WxMallService {
@Autowired
WxMallMapper wxMallMapper;

@Autowired
WxMallBuildingMapper wxMallBuildingMapper;

@Autowired
WxMallFloorMapper wxMallFloorMapper;

@Override
public PageInfo<WxMall> listAsPage(WxMall record, Integer pageIndex, Integer pageSize) {
@@ -54,9 +67,38 @@ public class WxMallServiceImpl implements WxMallService {
wxMall.setTenantId(id);
return wxMallMapper.findList(wxMall).get(0);
}

@Override
public WxMall getByTenantIdExt(String id) {
WxMall wxMallParam = new WxMall();
wxMallParam.setTenantId(id);
WxMall wxMall = wxMallMapper.findList(wxMallParam).get(0);

WxMallBuilding wxMallBuilding = new WxMallBuilding();
wxMallBuilding.setTenantId(id);
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);

}
wxMall.setBuildings(wxMallBuildings);
return wxMall;
}


}

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