Commit 325054ac authored by 周昊's avatar 周昊

1、开发接口根据楼宇id获取楼层列表

2、开发接口根据楼层id获取房间列表
parent 1a62d29e
package com.censoft.censoftrongtong.controller; package com.censoft.censoftrongtong.controller;
import com.censoft.censoftrongtong.domain.LedgerBuilding; import com.censoft.censoftrongtong.domain.*;
import com.censoft.censoftrongtong.domain.LedgerProject;
import com.censoft.censoftrongtong.domain.RiskPlan;
import com.censoft.censoftrongtong.domain.dto.RiskPlanAppDetailsDto; import com.censoft.censoftrongtong.domain.dto.RiskPlanAppDetailsDto;
import com.censoft.censoftrongtong.domain.dto.RiskPlanAppListDto; import com.censoft.censoftrongtong.domain.dto.RiskPlanAppListDto;
import com.censoft.censoftrongtong.enums.RiskPlanStatusType; import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
import com.censoft.censoftrongtong.service.ILedgerBuildingService; import com.censoft.censoftrongtong.service.*;
import com.censoft.censoftrongtong.service.ILedgerProjectService;
import com.censoft.censoftrongtong.service.IRiskPlanService;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.R;
...@@ -37,6 +33,12 @@ public class RiskPlanAppController extends BaseController { ...@@ -37,6 +33,12 @@ public class RiskPlanAppController extends BaseController {
@Resource @Resource
private ILedgerBuildingService ledgerBuildingService; private ILedgerBuildingService ledgerBuildingService;
@Resource
private ILedgerFloorService ledgerFloorService;
@Resource
private ILedgerRoomService ledgerRoomService;
@Resource @Resource
private IRiskPlanService riskPlanService; private IRiskPlanService riskPlanService;
...@@ -137,4 +139,26 @@ public class RiskPlanAppController extends BaseController { ...@@ -137,4 +139,26 @@ public class RiskPlanAppController extends BaseController {
public R<List<LedgerBuilding>> getBuildingListByPlanId(@PathVariable("planId") Long planId){ public R<List<LedgerBuilding>> getBuildingListByPlanId(@PathVariable("planId") Long planId){
return R.ok(riskPlanService.getBuildingListByPlanId(planId)); return R.ok(riskPlanService.getBuildingListByPlanId(planId));
} }
/**
* 根据楼宇id获取楼层列表
*
* @param buildingId 楼宇id
* @real_return {@link R<List<LedgerFloor>>}
*/
@GetMapping("/floor/list/{buildingId}")
public R<List<LedgerFloor>> getFloorListByBuildingId(@PathVariable("buildingId") Long buildingId){
return R.ok(ledgerFloorService.getFloorListByBuildingId(buildingId));
}
/**
* 根据楼层id获取房间列表
*
* @param floorId 楼宇id
* @real_return {@link R<List<LedgerRoom>>}
*/
@GetMapping("/room/list/{floorId}")
public R<List<LedgerRoom>> getRoomListByBuildingId(@PathVariable("floorId") Long floorId){
return R.ok(ledgerRoomService.getRoomListByBuildingId(floorId));
}
} }
package com.censoft.censoftrongtong.domain; package com.censoft.censoftrongtong.domain;
import java.math.BigDecimal; import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.*;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
...@@ -12,34 +14,43 @@ import com.ruoyi.common.core.domain.BaseEntity; ...@@ -12,34 +14,43 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author ruoyi * @author ruoyi
* @date 2023-06-26 * @date 2023-06-26
*/ */
@TableName("ledger_room")
public class LedgerRoom extends BaseEntity public class LedgerRoom extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** $column.columnComment */ /** $column.columnComment */
@TableId(type = IdType.AUTO)
private Long id; private Long id;
/** 楼层id */ /** 楼层id */
@Excel(name = "楼层id") @Excel(name = "楼层id")
@TableField("floor_id")
private Long floorId; private Long floorId;
/** 房间名称 */ /** 房间名称 */
@Excel(name = "房间名称") @Excel(name = "房间名称")
@TableField("name")
private String name; private String name;
/** 房间编号 */ /** 房间编号 */
@Excel(name = "房间编号") @Excel(name = "房间编号")
@TableField("number")
private String number; private String number;
/** 房间面积 */ /** 房间面积 */
@Excel(name = "房间面积") @Excel(name = "房间面积")
@TableField("area")
private BigDecimal area; private BigDecimal area;
/** 状态(0正常 1停用) */ /** 状态(0正常 1停用) */
@Excel(name = "状态", readConverterExp = "0=正常,1=停用") @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
@TableField("status")
private String status; private String status;
/** 删除标志(0代表存在 1代表删除) */ /** 删除标志(0代表存在 1代表删除) */
@TableField("del_flag")
@TableLogic
private String delFlag; private String delFlag;
public void setId(Long id) public void setId(Long id)
......
package com.censoft.censoftrongtong.mapper; package com.censoft.censoftrongtong.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.censoft.censoftrongtong.domain.LedgerRoom; import com.censoft.censoftrongtong.domain.LedgerRoom;
import java.util.List; import java.util.List;
...@@ -10,7 +11,7 @@ import java.util.List; ...@@ -10,7 +11,7 @@ import java.util.List;
* @author ruoyi * @author ruoyi
* @date 2023-06-26 * @date 2023-06-26
*/ */
public interface LedgerRoomMapper public interface LedgerRoomMapper extends BaseMapper<LedgerRoom>
{ {
/** /**
* 查询基础数据-楼层 * 查询基础数据-楼层
......
...@@ -59,4 +59,6 @@ public interface ILedgerFloorService ...@@ -59,4 +59,6 @@ public interface ILedgerFloorService
* @return 结果 * @return 结果
*/ */
public int deleteLedgerFloorById(Long id); public int deleteLedgerFloorById(Long id);
List<LedgerFloor> getFloorListByBuildingId(Long buildingId);
} }
package com.censoft.censoftrongtong.service; package com.censoft.censoftrongtong.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.censoft.censoftrongtong.domain.LedgerRoom; import com.censoft.censoftrongtong.domain.LedgerRoom;
import java.util.List; import java.util.List;
...@@ -10,7 +11,7 @@ import java.util.List; ...@@ -10,7 +11,7 @@ import java.util.List;
* @author ruoyi * @author ruoyi
* @date 2023-06-26 * @date 2023-06-26
*/ */
public interface ILedgerRoomService public interface ILedgerRoomService extends IService<LedgerRoom>
{ {
/** /**
* 查询基础数据-楼层 * 查询基础数据-楼层
...@@ -59,4 +60,6 @@ public interface ILedgerRoomService ...@@ -59,4 +60,6 @@ public interface ILedgerRoomService
* @return 结果 * @return 结果
*/ */
public int deleteLedgerRoomById(Long id); public int deleteLedgerRoomById(Long id);
List<LedgerRoom> getRoomListByBuildingId(Long floorId);
} }
...@@ -94,4 +94,12 @@ public class LedgerFloorServiceImpl implements ILedgerFloorService ...@@ -94,4 +94,12 @@ public class LedgerFloorServiceImpl implements ILedgerFloorService
{ {
return ledgerFloorMapper.deleteLedgerFloorById(id); return ledgerFloorMapper.deleteLedgerFloorById(id);
} }
@Override
public List<LedgerFloor> getFloorListByBuildingId(Long buildingId) {
LedgerFloor query = new LedgerFloor();
query.setBuildingId(buildingId);
query.setStatus("0");
return selectLedgerFloorList(query);
}
} }
...@@ -2,6 +2,9 @@ package com.censoft.censoftrongtong.service.impl; ...@@ -2,6 +2,9 @@ package com.censoft.censoftrongtong.service.impl;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.censoft.censoftrongtong.domain.LedgerRoom; import com.censoft.censoftrongtong.domain.LedgerRoom;
import com.censoft.censoftrongtong.mapper.LedgerRoomMapper; import com.censoft.censoftrongtong.mapper.LedgerRoomMapper;
import com.censoft.censoftrongtong.service.ILedgerRoomService; import com.censoft.censoftrongtong.service.ILedgerRoomService;
...@@ -16,8 +19,7 @@ import org.springframework.stereotype.Service; ...@@ -16,8 +19,7 @@ import org.springframework.stereotype.Service;
* @date 2023-06-26 * @date 2023-06-26
*/ */
@Service @Service
public class LedgerRoomServiceImpl implements ILedgerRoomService public class LedgerRoomServiceImpl extends ServiceImpl<LedgerRoomMapper, LedgerRoom> implements ILedgerRoomService {
{
@Autowired @Autowired
private LedgerRoomMapper ledgerRoomMapper; private LedgerRoomMapper ledgerRoomMapper;
...@@ -94,4 +96,12 @@ public class LedgerRoomServiceImpl implements ILedgerRoomService ...@@ -94,4 +96,12 @@ public class LedgerRoomServiceImpl implements ILedgerRoomService
{ {
return ledgerRoomMapper.deleteLedgerRoomById(id); return ledgerRoomMapper.deleteLedgerRoomById(id);
} }
@Override
public List<LedgerRoom> getRoomListByBuildingId(Long floorId) {
LambdaQueryWrapper<LedgerRoom> wrapper = new LambdaQueryWrapper<LedgerRoom>()
.eq(LedgerRoom::getFloorId, floorId)
.eq(LedgerRoom::getStatus, "0");
return list(wrapper);
}
} }
...@@ -116,6 +116,8 @@ mybatis-plus: ...@@ -116,6 +116,8 @@ mybatis-plus:
mapperLocations: classpath*:mapper/**/*Mapper.xml mapperLocations: classpath*:mapper/**/*Mapper.xml
# 加载全局的配置文件 # 加载全局的配置文件
# configLocation: classpath:mybatis/mybatis-config.xml # configLocation: classpath:mybatis/mybatis-config.xml
logic-delete-value: 1 # 逻辑已删除值(默认为 1)
logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
# PageHelper分页插件 # PageHelper分页插件
pagehelper: pagehelper:
......
...@@ -4,6 +4,8 @@ import java.io.Serializable; ...@@ -4,6 +4,8 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
...@@ -19,27 +21,34 @@ public class BaseEntity implements Serializable ...@@ -19,27 +21,34 @@ public class BaseEntity implements Serializable
/** 搜索值 */ /** 搜索值 */
@JsonIgnore @JsonIgnore
@TableField(exist = false)
private String searchValue; private String searchValue;
/** 创建者 */ /** 创建者 */
@TableField("create_by")
private String createBy; private String createBy;
/** 创建时间 */ /** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("create_time")
private Date createTime; private Date createTime;
/** 更新者 */ /** 更新者 */
@TableField("update_by")
private String updateBy; private String updateBy;
/** 更新时间 */ /** 更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("update_time")
private Date updateTime; private Date updateTime;
/** 备注 */ /** 备注 */
@TableField("remark")
private String remark; private String remark;
/** 请求参数 */ /** 请求参数 */
@JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonInclude(JsonInclude.Include.NON_EMPTY)
@TableField(exist = false)
private Map<String, Object> params; private Map<String, Object> params;
public String getSearchValue() public String getSearchValue()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment