by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(property): 修改楼层查询接口

Browse Source
This commit is contained in:
zcxlsm
2025-08-04 19:08:41 +08:00
parent 4f58aa9c1e
commit cf5757c48f
10 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbFloorController.java
View File

@@ -105,14 +105,14 @@ public class TbFloorController extends BaseController {
}
/**
* 根据单元ID查询楼层
* 根据楼层id查询楼层
*
* @param unitId 单元ID
* @param buildingId 单元ID
* @return 楼层
*/
@GetMapping("/queryByUnitId/{unitId}")
public R<List<TbFloorVo>> queryByUnitId(@NotNull(message = "单元ID不能为空")
@PathVariable("unitId") Long unitId) {
return R.ok(tbFloorService.queryByUnitId(unitId));
@GetMapping("/queryByBuildingId/{buildingId}")
public R<List<TbFloorVo>> queryByBuildingId(@NotNull(message = "楼层ID不能为空")
@PathVariable("buildingId") Long buildingId) {
return R.ok(tbFloorService.queryByBuildingId(buildingId));
}
}

10
ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteFloorServiceImpl.java
View File

@@ -5,6 +5,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.common.core.domain.TreeNode;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.property.api.RemoteFloorService;
import org.dromara.property.api.domain.vo.RemoteFloorVo;
import org.dromara.property.domain.vo.TbBuildingVo;
@@ -34,7 +35,6 @@ public class RemoteFloorServiceImpl implements RemoteFloorService {
private final ITbUnitService unitService;
private final ITbFloorService floorService;
@Override
public RemoteFloorVo queryByFloorId(Long floorId) {
TbFloorVo tbFloorVo = floorService.queryById(floorId);
@@ -103,14 +103,14 @@ public class RemoteFloorServiceImpl implements RemoteFloorService {
}
/**
* 根据单元ID查询楼层
* 根据楼层id查询楼层
*
* @param unitId 单元ID
* @param buildingId 单元ID
* @return 楼层
*/
@Override
public List<RemoteFloorVo> queryByUnitId(Long unitId){
List<TbFloorVo> tbFloorVo = floorService.queryByUnitId(unitId);
public List<RemoteFloorVo> queryByBuildingId(Long buildingId){
List<TbFloorVo> tbFloorVo = floorService.queryByBuildingId(buildingId);
List<RemoteFloorVo> remoteFloorVos = new ArrayList<>();
tbFloorVo.forEach(item -> {

6
ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbFloorService.java
View File

@@ -76,10 +76,10 @@ public interface ITbFloorService {
List<TbFloorVo> queryAll();
/**
* 根据单元ID查询楼层
* 根据楼层id查询楼层
*
* @param unitId 单元ID
* @param buildingId 单元ID
* @return 楼层
*/
List<TbFloorVo> queryByUnitId(Long unitId);
List<TbFloorVo> queryByBuildingId(Long buildingId);
}

8
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFloorServiceImpl.java
View File

@@ -160,15 +160,15 @@ public class TbFloorServiceImpl implements ITbFloorService {
}
/**
* 根据单元ID查询楼层
* 根据楼层id查询楼层
*
* @param unitId 单元ID
* @param buildingId 单元ID
* @return 楼层
*/
@Override
public List<TbFloorVo> queryByUnitId(Long unitId) {
public List<TbFloorVo> queryByBuildingId(Long buildingId) {
LambdaQueryWrapper<TbFloor> lqw = Wrappers.lambdaQuery();
lqw.eq(TbFloor::getUnitId, unitId)
lqw.eq(TbFloor::getBuildingId, buildingId)
.orderByAsc(TbFloor::getFloorNumber);
return baseMapper.selectVoList(lqw);
}