Merge remote-tracking branch 'origin/master'

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/controller/PtRoomController.java

@@ -0,0 +1,106 @@
+package org.dromara.backstage.basics.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.backstage.basics.domain.vo.PtRoomVo;
+import org.dromara.backstage.basics.domain.bo.PtRoomBo;
+import org.dromara.backstage.basics.service.IPtRoomService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 房间定义
+ * 前端访问路由地址为:/room/ptRoom
+ *
+ * @author bing
+ * @date 2024-08-09
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/room/ptRoom")
+public class PtRoomController extends BaseController {
+
+    private final IPtRoomService ptRoomService;
+
+    /**
+     * 查询房间定义列表
+     */
+    @SaCheckPermission("room:ptRoom:list")
+    @GetMapping("/list")
+    public TableDataInfo<PtRoomVo> list(PtRoomBo bo, PageQuery pageQuery) {
+        return ptRoomService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出房间定义列表
+     */
+    @SaCheckPermission("room:ptRoom:export")
+    @Log(title = "房间定义", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(PtRoomBo bo, HttpServletResponse response) {
+        List<PtRoomVo> list = ptRoomService.queryList(bo);
+        ExcelUtil.exportExcel(list, "房间定义", PtRoomVo.class, response);
+    }
+
+    /**
+     * 获取房间定义详细信息
+     *
+     * @param roomId 主键
+     */
+    @SaCheckPermission("room:ptRoom:query")
+    @GetMapping("/{roomId}")
+    public R<PtRoomVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long roomId) {
+        return R.ok(ptRoomService.queryById(roomId));
+    }
+
+    /**
+     * 新增房间定义
+     */
+    @SaCheckPermission("room:ptRoom:add")
+    @Log(title = "房间定义", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody PtRoomBo bo) {
+        return toAjax(ptRoomService.insertByBo(bo));
+    }
+
+    /**
+     * 修改房间定义
+     */
+    @SaCheckPermission("room:ptRoom:edit")
+    @Log(title = "房间定义", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody PtRoomBo bo) {
+        return toAjax(ptRoomService.updateByBo(bo));
+    }
+
+    /**
+     * 删除房间定义
+     *
+     * @param roomIds 主键串
+     */
+    @SaCheckPermission("room:ptRoom:remove")
+    @Log(title = "房间定义", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{roomIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] roomIds) {
+        return toAjax(ptRoomService.deleteWithValidByIds(List.of(roomIds), true));
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/domain/PtRoom.java

@@ -0,0 +1,87 @@
+package org.dromara.backstage.basics.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 房间定义对象 t_pt_room
+ *
+ * @author bing
+ * @date 2024-08-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_pt_room")
+public class PtRoom extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 房间Id,主键
+     */
+    @TableId(value = "room_id")
+    private Long roomId;
+
+    /**
+     * 所属区域id
+     */
+    private Long areaId;
+
+    /**
+     * 房间编码
+     */
+    private String roomCode;
+
+    /**
+     * 房间名称
+     */
+    private String roomName;
+
+    /**
+     * 房间类型,见FJLX字典类型
+     */
+    private String roomType;
+
+    /**
+     * 门牌号1
+     */
+    private String codeOne;
+
+    /**
+     * 门牌号2
+     */
+    private String codeTwo;
+
+    /**
+     * 门牌号3
+     */
+    private String codeThree;
+
+    /**
+     * 门牌号4
+     */
+    private String codeFour;
+
+    /**
+     * 门牌号5
+     */
+    private String codeFive;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标志(0-未删除 2-已删除)
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/domain/bo/PtRoomBo.java

@@ -0,0 +1,85 @@
+package org.dromara.backstage.basics.domain.bo;
+
+import org.dromara.backstage.basics.domain.PtRoom;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 房间定义业务对象 t_pt_room
+ *
+ * @author bing
+ * @date 2024-08-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = PtRoom.class, reverseConvertGenerate = false)
+public class PtRoomBo extends BaseEntity {
+
+    /**
+     * 房间Id,主键
+     */
+    @NotNull(message = "房间Id,主键不能为空", groups = { EditGroup.class })
+    private Long roomId;
+
+    /**
+     * 所属区域id
+     */
+    @NotNull(message = "所属区域id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long areaId;
+
+    /**
+     * 房间编码
+     */
+    @NotBlank(message = "房间编码不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String roomCode;
+
+    /**
+     * 房间名称
+     */
+    @NotBlank(message = "房间名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String roomName;
+
+    /**
+     * 房间类型,见FJLX字典类型
+     */
+    @NotBlank(message = "房间类型,见FJLX字典类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String roomType;
+
+    /**
+     * 门牌号1
+     */
+    @NotBlank(message = "门牌号1不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String codeOne;
+
+    /**
+     * 门牌号2
+     */
+    private String codeTwo;
+
+    /**
+     * 门牌号3
+     */
+    private String codeThree;
+
+    /**
+     * 门牌号4
+     */
+    private String codeFour;
+
+    /**
+     * 门牌号5
+     */
+    private String codeFive;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/domain/vo/PtRoomVo.java

@@ -0,0 +1,98 @@
+package org.dromara.backstage.basics.domain.vo;
+
+import org.dromara.backstage.basics.domain.PtRoom;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 房间定义视图对象 t_pt_room
+ *
+ * @author bing
+ * @date 2024-08-09
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = PtRoom.class)
+public class PtRoomVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 房间Id,主键
+     */
+    @ExcelProperty(value = "房间Id,主键")
+    private Long roomId;
+
+    /**
+     * 所属区域id
+     */
+//    @ExcelProperty(value = "所属区域id")
+    private Long areaId;
+
+    @ExcelProperty(value = "所属区域")
+    private String areaName;
+
+    /**
+     * 房间编码
+     */
+    @ExcelProperty(value = "房间编码")
+    private String roomCode;
+
+    /**
+     * 房间名称
+     */
+    @ExcelProperty(value = "房间名称")
+    private String roomName;
+
+    /**
+     * 房间类型,见FJLX字典类型
+     */
+    @ExcelProperty(value = "房间类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "FJLX")
+    private String roomType;
+
+    /**
+     * 门牌号1
+     */
+    @ExcelProperty(value = "门牌号1")
+    private String codeOne;
+
+    /**
+     * 门牌号2
+     */
+    @ExcelProperty(value = "门牌号2")
+    private String codeTwo;
+
+    /**
+     * 门牌号3
+     */
+    @ExcelProperty(value = "门牌号3")
+    private String codeThree;
+
+    /**
+     * 门牌号4
+     */
+    @ExcelProperty(value = "门牌号4")
+    private String codeFour;
+
+    /**
+     * 门牌号5
+     */
+    @ExcelProperty(value = "门牌号5")
+    private String codeFive;
+
+
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/mapper/PtRoomMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.backstage.basics.mapper;
+
+import org.dromara.backstage.basics.domain.PtRoom;
+import org.dromara.backstage.basics.domain.vo.PtRoomVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 房间定义Mapper接口
+ *
+ * @author bing
+ * @date 2024-08-09
+ */
+public interface PtRoomMapper extends BaseMapperPlus<PtRoom, PtRoomVo> {
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/service/IPtAreaService.java

@@ -6,6 +6,7 @@ import org.dromara.backstage.basics.domain.bo.PtAreaBo;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 建筑物区域Service接口
@@ -32,6 +33,10 @@ public interface IPtAreaService {
      */
     List<PtAreaVo> queryList(PtAreaBo bo);
 
+    List<PtAreaVo> queryListLD(Long areaId);
+
+    Map<Long, PtAreaVo> queryMapByIds(List<Long> ids);
+
     /**
      * 新增建筑物区域
      *

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/service/IPtRoomService.java

@@ -0,0 +1,69 @@
+package org.dromara.backstage.basics.service;
+
+import org.dromara.backstage.basics.domain.PtRoom;
+import org.dromara.backstage.basics.domain.vo.PtRoomVo;
+import org.dromara.backstage.basics.domain.bo.PtRoomBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 房间定义Service接口
+ *
+ * @author bing
+ * @date 2024-08-09
+ */
+public interface IPtRoomService {
+
+    /**
+     * 查询房间定义
+     *
+     * @param roomId 主键
+     * @return 房间定义
+     */
+    PtRoomVo queryById(Long roomId);
+
+    /**
+     * 分页查询房间定义列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 房间定义分页列表
+     */
+    TableDataInfo<PtRoomVo> queryPageList(PtRoomBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的房间定义列表
+     *
+     * @param bo 查询条件
+     * @return 房间定义列表
+     */
+    List<PtRoomVo> queryList(PtRoomBo bo);
+
+    /**
+     * 新增房间定义
+     *
+     * @param bo 房间定义
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(PtRoomBo bo);
+
+    /**
+     * 修改房间定义
+     *
+     * @param bo 房间定义
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(PtRoomBo bo);
+
+    /**
+     * 校验并批量删除房间定义信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/service/impl/PtAreaServiceImpl.java

@@ -1,5 +1,9 @@
 package org.dromara.backstage.basics.service.impl;
 
+import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.map.MapUtil;
+import org.dromara.backstage.basics.domain.PtRoom;
+import org.dromara.backstage.basics.mapper.PtRoomMapper;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
@@ -13,9 +17,8 @@ import org.dromara.backstage.basics.domain.PtArea;
 import org.dromara.backstage.basics.mapper.PtAreaMapper;
 import org.dromara.backstage.basics.service.IPtAreaService;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 建筑物区域Service业务层处理
@@ -29,6 +32,8 @@ public class PtAreaServiceImpl implements IPtAreaService {
 
     private final PtAreaMapper baseMapper;
 
+    private final PtRoomMapper ptRoomMapper;
+
     /**
      * 查询建筑物区域
      *
@@ -53,6 +58,40 @@ public class PtAreaServiceImpl implements IPtAreaService {
         return baseMapper.selectVoList(lqw);
     }
 
+    /**
+     * 查询楼层
+     * @param areaId
+     * @return
+     */
+    public List<PtAreaVo> queryListLD(Long areaId) {
+        PtAreaVo ptAreaVo = queryById(areaId);
+        if(ptAreaVo==null) return ListUtil.empty();
+        if("04".equals(ptAreaVo.getAreaType())) {
+            List<PtAreaVo> rs = new ArrayList<>();
+            rs.add(ptAreaVo);
+            return rs;
+        }
+        LambdaQueryWrapper<PtArea> lqw = Wrappers.lambdaQuery();
+        if(ptAreaVo.getParentId() != 0L){
+            lqw.likeRight(PtArea::getAncestors, ptAreaVo.getAncestors()+","+ptAreaVo.getAreaId());
+        }
+        lqw.eq(PtArea::getAreaType, "04");
+        return baseMapper.selectVoList(lqw);
+    }
+
+    @Override
+    public Map<Long, PtAreaVo> queryMapByIds(List<Long> ids) {
+        List<PtArea> ptAreas = baseMapper.selectBatchIds(ids);
+        if (ptAreas != null && !ptAreas.isEmpty()) {
+            return ptAreas.stream().map(e -> MapstructUtils.convert(e, PtAreaVo.class))
+                .filter(ptArea -> ptArea!=null&&ptArea.getAreaId() != null)
+                .filter(ptArea -> ptArea.getAreaId() != null)
+                .collect(Collectors.toMap(PtAreaVo::getAreaId, ptArea -> ptArea));
+        }
+        return MapUtil.empty();
+    }
+
+
     private LambdaQueryWrapper<PtArea> buildQueryWrapper(PtAreaBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<PtArea> lqw = Wrappers.lambdaQuery();
@@ -61,6 +100,10 @@ public class PtAreaServiceImpl implements IPtAreaService {
         return lqw;
     }
 
+
+
+
+
     /**
      * 新增建筑物区域
      *
@@ -71,6 +114,8 @@ public class PtAreaServiceImpl implements IPtAreaService {
     public Boolean insertByBo(PtAreaBo bo) {
         PtArea add = MapstructUtils.convert(bo, PtArea.class);
         validEntityBeforeSave(add);
+        //查询父节点的信息
+        setAncestors4Entity(bo, add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setAreaId(add.getAreaId());
@@ -78,6 +123,15 @@ public class PtAreaServiceImpl implements IPtAreaService {
         return flag;
     }
 
+    private void setAncestors4Entity(PtAreaBo bo, PtArea add) {
+        if(Objects.nonNull(bo.getParentId())){
+            PtArea parent = baseMapper.selectById(bo.getParentId());
+            if(parent!=null){
+                add.setAncestors(parent.getAncestors()+","+parent.getAreaId());
+            }
+        }
+    }
+
     /**
      * 修改建筑物区域
      *
@@ -88,6 +142,8 @@ public class PtAreaServiceImpl implements IPtAreaService {
     public Boolean updateByBo(PtAreaBo bo) {
         PtArea update = MapstructUtils.convert(bo, PtArea.class);
         validEntityBeforeSave(update);
+        //查询父节点的信息
+        setAncestors4Entity(bo, update);
         return baseMapper.updateById(update) > 0;
     }
 
@@ -101,6 +157,13 @@ public class PtAreaServiceImpl implements IPtAreaService {
         if (baseMapper.selectCount(lqw) > 0) {
             throw new ServiceException("区域名称重复");
         }
+        //父节点不能是楼层 04
+        if(entity.getParentId()!=null){
+            PtArea ptArea = baseMapper.selectById(entity.getParentId());
+            if(ptArea!=null && "04".equals(ptArea.getAreaType())){
+                throw new ServiceException("楼层不能作为父节点");
+            }
+        }
     }
 
     /**
@@ -119,6 +182,13 @@ public class PtAreaServiceImpl implements IPtAreaService {
             if (baseMapper.selectCount(lqw) > 0) {
                 throw new ServiceException("请先删除子节点");
             }
+            //下面有房间也不能删除
+            LambdaQueryWrapper<PtRoom> ptRoomLambdaQueryWrapper = Wrappers.lambdaQuery();
+            ptRoomLambdaQueryWrapper.in(PtRoom::getAreaId, ids);
+            Long aLong = ptRoomMapper.selectCount(ptRoomLambdaQueryWrapper);
+            if(aLong>0){
+                throw new ServiceException("请先删除房间");
+            }
         }
         return baseMapper.deleteByIds(ids) > 0;
     }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/service/impl/PtRoomServiceImpl.java

@@ -0,0 +1,191 @@
+package org.dromara.backstage.basics.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import org.dromara.backstage.basics.domain.vo.PtAreaVo;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.backstage.basics.domain.bo.PtRoomBo;
+import org.dromara.backstage.basics.domain.vo.PtRoomVo;
+import org.dromara.backstage.basics.domain.PtRoom;
+import org.dromara.backstage.basics.mapper.PtRoomMapper;
+import org.dromara.backstage.basics.service.IPtRoomService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 房间定义Service业务层处理
+ *
+ * @author bing
+ * @date 2024-08-09
+ */
+@RequiredArgsConstructor
+@Service
+public class PtRoomServiceImpl implements IPtRoomService {
+
+    private final PtRoomMapper baseMapper;
+
+    private final PtAreaServiceImpl areaService;
+
+    /**
+     * 查询房间定义
+     *
+     * @param roomId 主键
+     * @return 房间定义
+     */
+    @Override
+    public PtRoomVo queryById(Long roomId){
+        PtRoomVo ptRoomVo = baseMapper.selectVoById(roomId);
+        PtAreaVo ptAreaVo = areaService.queryById(ptRoomVo.getAreaId());
+        if(ptAreaVo != null){
+            ptRoomVo.setAreaName(ptAreaVo.getAreaName());
+        }
+        return ptRoomVo;
+    }
+
+    /**
+     * 分页查询房间定义列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 房间定义分页列表
+     */
+    @Override
+    public TableDataInfo<PtRoomVo> queryPageList(PtRoomBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<PtRoom> lqw = buildQueryWrapper2(bo);
+        if(bo.getAreaId()!=null){
+            List<PtAreaVo> ptAreaVos = areaService.queryListLD(bo.getAreaId());
+            if(CollectionUtil.isNotEmpty(ptAreaVos)){
+                List<Long> areaIds = ptAreaVos.stream().map(PtAreaVo::getAreaId).toList();
+                lqw.in(PtRoom::getAreaId, areaIds);
+            }else{
+                //没有楼层 就不用查询了
+                return TableDataInfo.build(new Page<>());
+            }
+
+        }
+        Page<PtRoomVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        List<PtRoomVo> records = result.getRecords();
+        setAreaName(records);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的房间定义列表
+     *
+     * @param bo 查询条件
+     * @return 房间定义列表
+     */
+    @Override
+    public List<PtRoomVo> queryList(PtRoomBo bo) {
+        LambdaQueryWrapper<PtRoom> lqw = buildQueryWrapper(bo);
+        List<PtRoomVo> ptRoomVos = baseMapper.selectVoList(lqw);
+        setAreaName(ptRoomVos);
+        return ptRoomVos;
+    }
+
+    private void setAreaName(List<PtRoomVo> ptRoomVos) {
+        if(CollectionUtil.isNotEmpty(ptRoomVos)){
+            Map<Long, PtAreaVo> areaMap = areaService.queryMapByIds(ptRoomVos.stream().map(PtRoomVo::getAreaId).toList());
+            ptRoomVos.forEach(ptRoomVo -> {
+                PtAreaVo ptAreaVo = areaMap.get(ptRoomVo.getAreaId());
+                if(ptAreaVo != null){
+                    ptRoomVo.setAreaName(ptAreaVo.getAreaName());
+                }
+            });
+        }
+    }
+
+    private LambdaQueryWrapper<PtRoom> buildQueryWrapper(PtRoomBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<PtRoom> lqw = buildQueryWrapper2(bo);
+        lqw.eq(bo.getAreaId() != null, PtRoom::getAreaId, bo.getAreaId());
+        return lqw;
+    }
+
+    private LambdaQueryWrapper<PtRoom> buildQueryWrapper2(PtRoomBo bo) {
+        LambdaQueryWrapper<PtRoom> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getRoomCode()), PtRoom::getRoomCode, bo.getRoomCode());
+        lqw.like(StringUtils.isNotBlank(bo.getRoomName()), PtRoom::getRoomName, bo.getRoomName());
+        lqw.eq(StringUtils.isNotBlank(bo.getRoomType()), PtRoom::getRoomType, bo.getRoomType());
+        lqw.eq(StringUtils.isNotBlank(bo.getCodeOne()), PtRoom::getCodeOne, bo.getCodeOne());
+        lqw.eq(StringUtils.isNotBlank(bo.getCodeTwo()), PtRoom::getCodeTwo, bo.getCodeTwo());
+        lqw.eq(StringUtils.isNotBlank(bo.getCodeThree()), PtRoom::getCodeThree, bo.getCodeThree());
+        lqw.eq(StringUtils.isNotBlank(bo.getCodeFour()), PtRoom::getCodeFour, bo.getCodeFour());
+        lqw.eq(StringUtils.isNotBlank(bo.getCodeFive()), PtRoom::getCodeFive, bo.getCodeFive());
+        return lqw;
+    }
+
+    /**
+     * 新增房间定义
+     *
+     * @param bo 房间定义
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(PtRoomBo bo) {
+        PtRoom add = MapstructUtils.convert(bo, PtRoom.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setRoomId(add.getRoomId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改房间定义
+     *
+     * @param bo 房间定义
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(PtRoomBo bo) {
+        PtRoom update = MapstructUtils.convert(bo, PtRoom.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(PtRoom entity){
+        //做一些数据校验,如唯一约束
+        //同一个楼栋 不能有相同的名称和门牌号
+        if(StringUtils.isNotBlank(entity.getRoomName())){
+            Long aLong = baseMapper.selectCount(Wrappers.<PtRoom>lambdaQuery()
+                .eq(PtRoom::getAreaId, entity.getAreaId())
+                .and(
+                    queryWrapper -> queryWrapper.eq(PtRoom::getRoomName, entity.getRoomName()).or().eq(PtRoom::getRoomCode, entity.getRoomCode())
+                )
+                .ne(entity.getRoomId() != null, PtRoom::getRoomId, entity.getRoomId())
+            );
+            if(aLong != null && aLong>0){
+               throw new RuntimeException("房间名称或者房间编号重复");
+            }
+        }
+    }
+
+    /**
+     * 校验并批量删除房间定义信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/basics/room/PtRoomMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.backstage.basics.mapper.PtRoomMapper">
+
+    <resultMap type="org.dromara.backstage.basics.domain.PtRoom" id="PtRoomResult">
+            <result property="roomId"    column="room_id"    />
+            <result property="tenantId"    column="tenant_id"    />
+            <result property="areaId"    column="area_id"    />
+            <result property="roomCode"    column="room_code"    />
+            <result property="roomName"    column="room_name"    />
+            <result property="roomType"    column="room_type"    />
+            <result property="codeOne"    column="code_one"    />
+            <result property="codeTwo"    column="code_two"    />
+            <result property="codeThree"    column="code_three"    />
+            <result property="codeFour"    column="code_four"    />
+            <result property="codeFive"    column="code_five"    />
+            <result property="remark"    column="remark"    />
+            <result property="delFlag"    column="del_flag"    />
+            <result property="createDept"    column="create_dept"    />
+            <result property="createBy"    column="create_by"    />
+            <result property="createTime"    column="create_time"    />
+            <result property="updateBy"    column="update_by"    />
+            <result property="updateTime"    column="update_time"    />
+    </resultMap>
+</mapper>