diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMallBuildingController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMallBuildingController.java index 170a712bb..38e652982 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMallBuildingController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMallBuildingController.java @@ -1,19 +1,16 @@ package com.simple.controller; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; - import com.simple.domain.po.WxMallBuilding; import com.simple.service.WxMallBuildingService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxMallBuilding") @@ -65,7 +62,14 @@ public class WxMallBuildingController extends BaseController public ResultData findById(Long id) { return new ResultData(Result.SUCCESS,"查询成功",wxMallBuildingService.getById(id)); } - - - + + + @ApiOperation("获取所有数据") + @GetMapping("getbuildinglist") + public ResultData getbuildinglist() { + return wxMallBuildingService.getbuildinglist(getTenantId()); + } + + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMallFloorController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMallFloorController.java index 23e580207..8f6a572b7 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMallFloorController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMallFloorController.java @@ -65,7 +65,14 @@ public class WxMallFloorController extends BaseController public ResultData findById(Long id) { return new ResultData(Result.SUCCESS,"查询成功",wxMallFloorService.getById(id)); } - - - + + @ApiOperation("获取所有数据") + @GetMapping("getfloorlist") + @ApiImplicitParams({ + @ApiImplicitParam(name="buildingId",value="楼座ID",dataType="Long", paramType = "query",required=true)}) + public ResultData getfloorlist(Long buildingId){ + return wxMallFloorService.getfloorlist(getTenantId(),buildingId); + } + + } diff --git a/mallinkService/src/main/java/com/simple/service/WxMallBuildingService.java b/mallinkService/src/main/java/com/simple/service/WxMallBuildingService.java index c6d2ba75c..43b63c037 100644 --- a/mallinkService/src/main/java/com/simple/service/WxMallBuildingService.java +++ b/mallinkService/src/main/java/com/simple/service/WxMallBuildingService.java @@ -2,6 +2,7 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; +import com.simple.common.ResultData; import com.simple.domain.po.WxMallBuilding; public interface WxMallBuildingService { @@ -37,12 +38,8 @@ public interface WxMallBuildingService { * @param id */ void deleteById(Long id); - - - - - - - + + ResultData getbuildinglist(String tenantId); + } diff --git a/mallinkService/src/main/java/com/simple/service/WxMallFloorService.java b/mallinkService/src/main/java/com/simple/service/WxMallFloorService.java index 487c49090..ba29d12ce 100644 --- a/mallinkService/src/main/java/com/simple/service/WxMallFloorService.java +++ b/mallinkService/src/main/java/com/simple/service/WxMallFloorService.java @@ -2,6 +2,7 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; +import com.simple.common.ResultData; import com.simple.domain.po.WxMallFloor; public interface WxMallFloorService { @@ -37,12 +38,8 @@ public interface WxMallFloorService { * @param id */ void deleteById(Long id); - - - - - - - + + ResultData getfloorlist(String tenantId, Long buildingId); + } 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 ea38e3407..050f56a37 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMallBuildingServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMallBuildingServiceImpl.java @@ -3,6 +3,7 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.simple.common.ResultData; import com.simple.domain.po.WxMallBuilding; import com.simple.mapper.WxMallBuildingMapper; import com.simple.service.WxMallBuildingService; @@ -43,12 +44,14 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { public void deleteById(Long id) { wxMallBuildingMapper.deleteByPrimaryKey(id); } - - - - - - - - + + @Override + public ResultData getbuildinglist(String tenantId) { + WxMallBuilding wxMallBuilding = new WxMallBuilding(); + wxMallBuilding.setTenantId(tenantId); + List list = wxMallBuildingMapper.findList(wxMallBuilding); + return new ResultData(list); + } + + } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMallFloorServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMallFloorServiceImpl.java index f0b651088..8e4398516 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMallFloorServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMallFloorServiceImpl.java @@ -3,6 +3,8 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.simple.common.ResultData; +import com.simple.domain.po.WxMallBuilding; import com.simple.domain.po.WxMallFloor; import com.simple.mapper.WxMallFloorMapper; import com.simple.service.WxMallFloorService; @@ -43,9 +45,16 @@ public class WxMallFloorServiceImpl implements WxMallFloorService { public void deleteById(Long id) { wxMallFloorMapper.deleteByPrimaryKey(id); } - - - + + + @Override + public ResultData getfloorlist(String tenantId,Long buildingId) { + WxMallFloor wxMallFloor = new WxMallFloor(); + wxMallFloor.setTenantId(tenantId); + wxMallFloor.setBuildingId(buildingId); + List list = wxMallFloorMapper.findList(wxMallFloor); + return new ResultData(list); + }