提交房间操作的修改

backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormRoomController.java

@@ -0,0 +1,105 @@
+package org.dromara.xg.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.xg.domain.vo.XgDormRoomVo;
+import org.dromara.xg.domain.bo.XgDormRoomBo;
+import org.dromara.xg.service.IXgDormRoomService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 宿舍房间信息
+ *
+ * @author zlwu
+ * @date 2025-07-22
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/xgss/dormRoom")
+public class XgDormRoomController extends BaseController {
+
+    private final IXgDormRoomService xgDormRoomService;
+
+    /**
+     * 查询宿舍房间信息列表
+     */
+    @SaCheckPermission("xgss:dormRoom:list")
+    @GetMapping("/list")
+    public TableDataInfo<XgDormRoomVo> list(XgDormRoomBo bo, PageQuery pageQuery) {
+        return xgDormRoomService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出宿舍房间信息列表
+     */
+    @SaCheckPermission("xgss:dormRoom:export")
+    @Log(title = "宿舍房间信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(XgDormRoomBo bo, HttpServletResponse response) {
+        List<XgDormRoomVo> list = xgDormRoomService.queryList(bo);
+        ExcelUtil.exportExcel(list, "宿舍房间信息", XgDormRoomVo.class, response);
+    }
+
+    /**
+     * 获取宿舍房间信息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("xgss:dormRoom:query")
+    @GetMapping("/{id}")
+    public R<XgDormRoomVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(xgDormRoomService.queryById(id));
+    }
+
+    /**
+     * 新增宿舍房间信息
+     */
+    @SaCheckPermission("xgss:dormRoom:add")
+    @Log(title = "宿舍房间信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody XgDormRoomBo bo) {
+        return toAjax(xgDormRoomService.insertByBo(bo));
+    }
+
+    /**
+     * 修改宿舍房间信息
+     */
+    @SaCheckPermission("xgss:dormRoom:edit")
+    @Log(title = "宿舍房间信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody XgDormRoomBo bo) {
+        return toAjax(xgDormRoomService.updateByBo(bo));
+    }
+
+    /**
+     * 删除宿舍房间信息
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("xgss:dormRoom:remove")
+    @Log(title = "宿舍房间信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(xgDormRoomService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/domain/XgDormRoom.java

@@ -0,0 +1,81 @@
+package org.dromara.xg.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 宿舍房间信息对象 xg_dorm_room
+ *
+ * @author zlwu
+ * @date 2025-07-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("xg_dorm_room")
+public class XgDormRoom extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 房间编号
+     */
+    private String roomCode;
+
+    /**
+     * 房间名称
+     */
+    private String roomName;
+
+    /**
+     * 所属宿舍楼ID
+     */
+    private Long buildingId;
+
+    /**
+     * 楼层
+     */
+    private Long floorNum;
+
+    /**
+     * 房间类型(1标准间 2 单人间 3 套间)
+     */
+    private String roomType;
+
+    /**
+     * 实际床位数
+     */
+    private Long actualBeds;
+
+    /**
+     * 房间面积(平方米)
+     */
+    private Double roomArea;
+
+    /**
+     * 房间状态(0可用 1维修中 2停用)
+     */
+    private String roomStatus;
+
+    /**
+     * 删除标志(0代表存在 1代表删除)
+     */
+    @TableLogic(value = "0", delval = "1")
+    private String deleted;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/domain/bo/XgDormRoomBo.java

@@ -0,0 +1,84 @@
+package org.dromara.xg.domain.bo;
+
+import org.dromara.xg.domain.XgDormRoom;
+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.*;
+
+/**
+ * 宿舍房间信息业务对象 xg_dorm_room
+ *
+ * @author zlwu
+ * @date 2025-07-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = XgDormRoom.class, reverseConvertGenerate = false)
+public class XgDormRoomBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 房间编号
+     */
+    @NotBlank(message = "房间编号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String roomCode;
+
+    /**
+     * 房间名称
+     */
+    @NotBlank(message = "房间名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String roomName;
+
+    /**
+     * 所属宿舍楼ID
+     */
+    @NotNull(message = "所属宿舍楼ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long buildingId;
+
+    /**
+     * 楼层
+     */
+    @NotNull(message = "楼层不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long floorNum;
+
+    /**
+     * 房间类型(1标准间 2 单人间 3 套间)
+     */
+    private String roomType;
+
+    /**
+     * 实际床位数
+     */
+    private Long actualBeds;
+
+    /**
+     * 房间面积(平方米)
+     */
+    private Double roomArea;
+
+    /**
+     * 房间状态(0可用 1维修中 2停用)
+     */
+    private String roomStatus;
+
+    /**
+     * 删除标志(0代表存在 1代表删除)
+     */
+    private String deleted;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/domain/vo/XgDormRoomVo.java

@@ -0,0 +1,98 @@
+package org.dromara.xg.domain.vo;
+
+import org.dromara.xg.domain.XgDormRoom;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.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;
+
+
+
+/**
+ * 宿舍房间信息视图对象 xg_dorm_room
+ *
+ * @author zlwu
+ * @date 2025-07-22
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = XgDormRoom.class)
+public class XgDormRoomVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 房间编号
+     */
+    @ExcelProperty(value = "房间编号")
+    private String roomCode;
+
+    /**
+     * 房间名称
+     */
+    @ExcelProperty(value = "房间名称")
+    private String roomName;
+
+    /**
+     * 所属宿舍楼ID
+     */
+    @ExcelProperty(value = "所属宿舍楼ID")
+    private Long buildingId;
+
+    /**
+     * 楼层
+     */
+    @ExcelProperty(value = "楼层")
+    private Long floorNum;
+
+    /**
+     * 房间类型(1标准间 2 单人间 3 套间)
+     */
+    @ExcelProperty(value = "房间类型(1标准间 2 单人间 3 套间)")
+    private String roomType;
+
+    /**
+     * 实际床位数
+     */
+    @ExcelProperty(value = "实际床位数")
+    private Long actualBeds;
+
+    /**
+     * 房间面积(平方米)
+     */
+    @ExcelProperty(value = "房间面积(平方米)")
+    private Double roomArea;
+
+    /**
+     * 房间状态(0可用 1维修中 2停用)
+     */
+    @ExcelProperty(value = "房间状态(0可用 1维修中 2停用)")
+    private String roomStatus;
+
+    /**
+     * 删除标志(0代表存在 1代表删除)
+     */
+    @ExcelProperty(value = "删除标志(0代表存在 1代表删除)")
+    private String deleted;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/mapper/XgDormRoomMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.xg.mapper;
+
+import org.dromara.xg.domain.XgDormRoom;
+import org.dromara.xg.domain.vo.XgDormRoomVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 宿舍房间信息Mapper接口
+ *
+ * @author zlwu
+ * @date 2025-07-22
+ */
+public interface XgDormRoomMapper extends BaseMapperPlus<XgDormRoom, XgDormRoomVo> {
+
+}

backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/IXgDormRoomService.java

@@ -0,0 +1,68 @@
+package org.dromara.xg.service;
+
+import org.dromara.xg.domain.vo.XgDormRoomVo;
+import org.dromara.xg.domain.bo.XgDormRoomBo;
+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 zlwu
+ * @date 2025-07-22
+ */
+public interface IXgDormRoomService {
+
+    /**
+     * 查询宿舍房间信息
+     *
+     * @param id 主键
+     * @return 宿舍房间信息
+     */
+    XgDormRoomVo queryById(Long id);
+
+    /**
+     * 分页查询宿舍房间信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 宿舍房间信息分页列表
+     */
+    TableDataInfo<XgDormRoomVo> queryPageList(XgDormRoomBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的宿舍房间信息列表
+     *
+     * @param bo 查询条件
+     * @return 宿舍房间信息列表
+     */
+    List<XgDormRoomVo> queryList(XgDormRoomBo bo);
+
+    /**
+     * 新增宿舍房间信息
+     *
+     * @param bo 宿舍房间信息
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(XgDormRoomBo bo);
+
+    /**
+     * 修改宿舍房间信息
+     *
+     * @param bo 宿舍房间信息
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(XgDormRoomBo bo);
+
+    /**
+     * 校验并批量删除宿舍房间信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgDormRoomServiceImpl.java

@@ -0,0 +1,140 @@
+package org.dromara.xg.service.impl;
+
+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 lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.dromara.xg.domain.bo.XgDormRoomBo;
+import org.dromara.xg.domain.vo.XgDormRoomVo;
+import org.dromara.xg.domain.XgDormRoom;
+import org.dromara.xg.mapper.XgDormRoomMapper;
+import org.dromara.xg.service.IXgDormRoomService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 宿舍房间信息Service业务层处理
+ *
+ * @author zlwu
+ * @date 2025-07-22
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class XgDormRoomServiceImpl implements IXgDormRoomService {
+
+    private final XgDormRoomMapper baseMapper;
+
+    /**
+     * 查询宿舍房间信息
+     *
+     * @param id 主键
+     * @return 宿舍房间信息
+     */
+    @Override
+    public XgDormRoomVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询宿舍房间信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 宿舍房间信息分页列表
+     */
+    @Override
+    public TableDataInfo<XgDormRoomVo> queryPageList(XgDormRoomBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<XgDormRoom> lqw = buildQueryWrapper(bo);
+        Page<XgDormRoomVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的宿舍房间信息列表
+     *
+     * @param bo 查询条件
+     * @return 宿舍房间信息列表
+     */
+    @Override
+    public List<XgDormRoomVo> queryList(XgDormRoomBo bo) {
+        LambdaQueryWrapper<XgDormRoom> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<XgDormRoom> buildQueryWrapper(XgDormRoomBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<XgDormRoom> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(XgDormRoom::getId);
+        lqw.like(StringUtils.isNotBlank(bo.getRoomCode()), XgDormRoom::getRoomCode, bo.getRoomCode());
+        lqw.like(StringUtils.isNotBlank(bo.getRoomName()), XgDormRoom::getRoomName, bo.getRoomName());
+        lqw.eq(bo.getBuildingId() != null, XgDormRoom::getBuildingId, bo.getBuildingId());
+        lqw.eq(bo.getFloorNum() != null, XgDormRoom::getFloorNum, bo.getFloorNum());
+        lqw.eq(StringUtils.isNotBlank(bo.getRoomType()), XgDormRoom::getRoomType, bo.getRoomType());
+        lqw.eq(bo.getActualBeds() != null, XgDormRoom::getActualBeds, bo.getActualBeds());
+        lqw.eq(bo.getRoomArea() != null, XgDormRoom::getRoomArea, bo.getRoomArea());
+        lqw.eq(StringUtils.isNotBlank(bo.getRoomStatus()), XgDormRoom::getRoomStatus, bo.getRoomStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getDeleted()), XgDormRoom::getDeleted, bo.getDeleted());
+        return lqw;
+    }
+
+    /**
+     * 新增宿舍房间信息
+     *
+     * @param bo 宿舍房间信息
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(XgDormRoomBo bo) {
+        XgDormRoom add = MapstructUtils.convert(bo, XgDormRoom.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改宿舍房间信息
+     *
+     * @param bo 宿舍房间信息
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(XgDormRoomBo bo) {
+        XgDormRoom update = MapstructUtils.convert(bo, XgDormRoom.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(XgDormRoom entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除宿舍房间信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

backend/ruoyi-modules/ruoyi-xg/src/main/resources/mapper/xgss/XgDormRoomMapper.xml

@@ -0,0 +1,7 @@
+<?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.xg.mapper.XgDormRoomMapper">
+
+</mapper>

docs/设计文档/database/学工管理-宿舍管理/宿舍管理数据库建表脚本.sql

@@ -80,10 +80,10 @@ create table `xg_dorm_room` (
   `room_name` varchar(100) not null comment '房间名称',
   `building_id` bigint(20) not null comment '所属宿舍楼ID',
   `floor_num` int(11) not null comment '楼层',
-  `room_type` char(1) default '1' comment '房间类型(1学生宿舍 3教师宿舍)',
+  `room_type` char(1) default '1' comment '房间类型(1标准间 2 单人间 3 套间)',
   `actual_beds` int(11) default 4 comment '实际床位数',
   `room_area` decimal(10,2) default null comment '房间面积(平方米)',
-  `room_status` char(1) default '0' comment '房间状态(0可用 1维修中 2已报废)',
+  `room_status` char(1) default '0' comment '房间状态(0可用 1维修中 2停用）',
   `deleted` char(1) default '0' comment '删除标志(0代表存在 1代表删除)',
   `tenant_id` bigint(20) default '0' comment '租户编号',
   `create_by` bigint(20) default null comment '创建者',

web/src/api/xgss/xsssfjgl/types.ts

@@ -25,11 +25,13 @@ export interface DormTreeNode {
 // 房间信息
 export interface RoomInfo extends BaseEntity {
   roomId: string | number;
+  roomCode: string;
   roomName: string;
-  floorNumber: number;
+  floorNum: number;
   buildingId: string | number;
   capacity: number;
   used: number;
+  roomArea: number;
   roomType: string;
   status: string; // 0-正常 1-维修中 2-停用
   remark: string;
@@ -50,17 +52,19 @@ export interface BedInfo extends BaseEntity {
 export interface DormQuery extends PageQuery {
   buildingId?: string | number;
   roomName?: string;
-  floorNumber?: number;
+  floorNum?: number;
   status?: string;
 }
 
 // 房间表单
 export interface RoomForm {
   roomId?: string | number;
+  roomCode: string;
   roomName: string;
-  floorNumber: number;
+  floorNum: number;
   buildingId: string | number;
   capacity: number;
+  roomArea: number;
   roomType: string;
   status: string;
   remark?: string;

web/src/views/xgss/xsssfjgl/components/RoomDialog.vue

@@ -1,24 +1,34 @@
 <template>
   <el-dialog v-model="visible" :title="title" width="500px" append-to-body @close="closeDialog">
     <el-form ref="formRef" :model="form" :rules="rules" label-width="80px">
-      <el-form-item label="楼层" prop="floorNumber">
+      <el-form-item label="楼层" prop="floorNum">
-        <el-input v-model="form.floorNumber" placeholder="请输入楼层" :disabled="true" />
+        <el-input v-model="form.floorNum" placeholder="请输入楼层" :disabled="true" />
+      </el-form-item>
+      <el-form-item label="房间编号" prop="roomCode">
+        <el-input v-model="form.roomCode" placeholder="请输入房间编号" maxlength="20" />
       </el-form-item>
       <el-form-item label="房间名称" prop="roomName">
         <el-input v-model="form.roomName" placeholder="请输入房间名称" maxlength="20" />
       </el-form-item>
       <el-form-item label="房间类型" prop="roomType">
         <el-select v-model="form.roomType" placeholder="请选择房间类型" clearable style="width: 100%">
-          <el-option label="标准间" value="标准间" />
+          <el-option label="标准间" value="1" />
-          <el-option label="单人间" value="单人间" />
+          <el-option label="单人间" value="2" />
-          <el-option label="套间" value="套间" />
+          <el-option label="套间" value="3" />
         </el-select>
       </el-form-item>
-      <el-form-item label="床位数量" prop="capacity">
+      <el-form-item label="床位数量" prop="actualBeds">
-        <el-input-number v-model="form.capacity" :min="1" :max="8" controls-position="right" style="width: 100%" />
+        <el-input-number v-model="form.actualBeds" :min="1" :max="8" controls-position="right" style="width: 100%" />
       </el-form-item>
-      <el-form-item label="房间状态" prop="status">
+      <el-form-item label="房间面积" prop="roomArea">
-        <el-radio-group v-model="form.status">
+        <el-input v-model="form.roomArea" placeholder="请输入房间面积" maxlength="20">
+          <template #append>
+            <span style="color: #000; background: transparent">平方米</span>
+          </template>
+        </el-input>
+      </el-form-item>
+      <el-form-item label="房间状态" prop="roomStatus">
+        <el-radio-group v-model="form.roomStatus">
           <el-radio label="0">正常</el-radio>
           <el-radio label="1">维修中</el-radio>
           <el-radio label="2">停用</el-radio>
@@ -40,15 +50,16 @@
 <script setup lang="ts">
 import { ref, reactive, watch } from 'vue';
 import type { FormInstance, FormRules } from 'element-plus';
-import { RoomForm } from '@/api/xgss/xsssfjgl/types';
+import { DormRoomForm, DormRoomVO } from '@/api/xgss/dormRoom/types';
-import { addRoom, updateRoom } from '@/api/xgss/xsssfjgl';
+import { addDormRoom, updateDormRoom } from '@/api/xgss/dormRoom';
 
 const props = defineProps<{
   modelValue: boolean;
   title: string;
   roomId?: string | number;
-  floorNumber: number;
+  floorNum: number;
   buildingId: string | number;
+  room?: DormRoomVO;
 }>();
 
 const emit = defineEmits(['update:modelValue', 'success']);
@@ -57,25 +68,29 @@ const formRef = ref<FormInstance>();
 const visible = ref(false);
 
 // 表单数据
-const initFormData: RoomForm = {
+const initFormData: DormRoomForm = {
+  id: undefined,
+  roomCode: '',
   roomName: '',
-  floorNumber: 1,
+  floorNum: 1,
   buildingId: '',
-  capacity: 4,
+  actualBeds: 4,
-  roomType: '标准间',
+  roomArea: 0,
-  status: '0',
+  roomType: '1',
+  roomStatus: '0',
   remark: ''
 };
 
-const form = reactive<RoomForm>({ ...initFormData });
+const form = reactive<DormRoomForm>({ ...initFormData });
 
 // 表单校验规则
 const rules = reactive<FormRules>({
+  roomCode: [{ required: true, message: '房间编号不能为空', trigger: 'blur' }],
   roomName: [{ required: true, message: '房间名称不能为空', trigger: 'blur' }],
-  floorNumber: [{ required: true, message: '楼层不能为空', trigger: 'blur' }],
+  floorNum: [{ required: true, message: '楼层不能为空', trigger: 'blur' }],
-  capacity: [{ required: true, message: '床位数量不能为空', trigger: 'change' }],
+  actualBeds: [{ required: true, message: '床位数量不能为空', trigger: 'change' }],
   roomType: [{ required: true, message: '房间类型不能为空', trigger: 'change' }],
-  status: [{ required: true, message: '房间状态不能为空', trigger: 'change' }]
+  roomStatus: [{ required: true, message: '房间状态不能为空', trigger: 'change' }]
 });
 
 // 监听visible属性变化
@@ -84,10 +99,21 @@ watch(
   (val) => {
     visible.value = val;
     if (val) {
+      // 完全重置表单，确保没有残留数据
       resetForm();
-      // 设置表单初始值
+
-      form.floorNumber = props.floorNumber;
+      // 重新设置基本参数
+      form.floorNum = props.floorNum;
       form.buildingId = props.buildingId;
+
+      // 如果是编辑模式且有room数据，填充表单数据
+      if (props.room) {
+        Object.keys(form).forEach((key) => {
+          if (key in props.room) {
+            form[key] = props.room[key];
+          }
+        });
+      }
     }
   }
 );
@@ -108,7 +134,10 @@ const closeDialog = () => {
 
 // 重置表单
 const resetForm = () => {
-  Object.assign(form, { ...initFormData });
+  // 使用深拷贝确保完全重置
+  Object.keys(form).forEach((key) => {
+    form[key] = initFormData[key];
+  });
   formRef.value?.resetFields();
 };
 
@@ -119,11 +148,11 @@ const submitForm = () => {
       try {
         if (props.roomId) {
           // 修改
-          form.roomId = props.roomId;
+          form.id = props.roomId;
-          await updateRoom(form);
+          await updateDormRoom(form);
         } else {
           // 新增
-          await addRoom(form);
+          await addDormRoom(form);
         }
         closeDialog();
         emit('success');

web/src/views/xgss/xsssfjgl/index.vue

@@ -36,8 +36,8 @@
                 <el-form-item label="房间号" prop="roomName">
                   <el-input v-model="queryParams.roomName" placeholder="请输入房间号" clearable @keyup.enter="handleQuery" />
                 </el-form-item>
-                <el-form-item label="状态" prop="status">
+                <el-form-item label="状态" prop="roomStatus">
-                  <el-select v-model="queryParams.status" placeholder="房间状态" clearable>
+                  <el-select v-model="queryParams.roomStatus" placeholder="房间状态" clearable>
                     <el-option label="正常" value="0" />
                     <el-option label="维修中" value="1" />
                     <el-option label="停用" value="2" />
@@ -67,7 +67,11 @@
                   <span class="font-bold">{{ selectedBuilding?.label }} - 房间管理</span>
                 </el-col>
                 <el-col :span="12" class="text-right">
-                  <right-toolbar v-model:show-search="showSearch" @query-table="loadRoomData"></right-toolbar>
+                  <right-toolbar
+                    :show-search="showSearch"
+                    @update:show-search="(val) => (showSearch = val)"
+                    @query-table="loadRoomData"
+                  ></right-toolbar>
                 </el-col>
               </el-row>
             </template>
@@ -84,23 +88,25 @@
                 <div v-else class="room-grid">
                   <el-card
                     v-for="room in getRoomsByFloor(floor)"
-                    :key="room.roomId"
+                    :key="room.id"
                     class="room-card"
-                    :class="{ 'room-disabled': room.status !== '0' }"
+                    :class="{ 'room-disabled': room.roomStatus !== '0' }"
                   >
                     <template #header>
                       <div class="flex items-center justify-between">
                         <span class="font-bold">{{ room.roomName }}</span>
                         <div>
-                          <el-tag v-if="room.status === '0'" type="success" size="small">正常</el-tag>
+                          <el-tag v-if="room.roomStatus === '0'" type="success" size="small">正常</el-tag>
-                          <el-tag v-else-if="room.status === '1'" type="warning" size="small">维修中</el-tag>
+                          <el-tag v-else-if="room.roomStatus === '1'" type="warning" size="small">维修中</el-tag>
                           <el-tag v-else type="danger" size="small">停用</el-tag>
                         </div>
                       </div>
                     </template>
                     <div class="room-info">
-                      <div class="mb-2"><span class="text-gray-500">类型：</span>{{ room.roomType }}</div>
+                      <div class="mb-2">
-                      <div class="mb-2"><span class="text-gray-500">床位：</span>{{ room.used }}/{{ room.capacity }}</div>
+                        <span class="text-gray-500">类型：</span>{{ room.roomType === '1' ? '标准间' : room.roomType === '2' ? '单人间' : '套间' }}
+                      </div>
+                      <div class="mb-2"><span class="text-gray-500">床位：</span>0/{{ room.actualBeds }}</div>
                       <div class="flex justify-between mt-4">
                         <div>
                           <el-button type="primary" link size="small" @click="handleManageBeds(room)">床位管理</el-button>
@@ -125,8 +131,9 @@
       v-model="roomDialog.visible"
       :title="roomDialog.title"
       :room-id="roomDialog.roomId"
-      :floor-number="roomDialog.floorNumber"
+      :floor-num="roomDialog.floorNum"
       :building-id="roomDialog.buildingId"
+      :room="roomDialog.room"
       @success="handleRoomSuccess"
     />
 
@@ -168,10 +175,12 @@
 
 <script setup name="DormRoomManagement" lang="ts">
 import { ref, computed, reactive, onMounted, nextTick, watch } from 'vue';
-import { ElMessageBox, ElMessage } from 'element-plus';
+import { ElMessage, ElMessageBox } from 'element-plus';
 import { InfoFilled, Search } from '@element-plus/icons-vue';
-import { DormTreeNode, RoomInfo, BedInfo, DormQuery } from '@/api/xgss/xsssfjgl/types';
+import { DormTreeNode, BedInfo, DormQuery } from '@/api/xgss/xsssfjgl/types';
-import { getDormTree, listRooms, delRoom, listBeds, delBed } from '@/api/xgss/xsssfjgl';
+import { DormRoomVO, DormRoomQuery } from '@/api/xgss/dormRoom/types';
+import { getDormTree, listBeds, delBed } from '@/api/xgss/xsssfjgl';
+import { listDormRoom, delDormRoom } from '@/api/xgss/dormRoom';
 
 // 引入子组件
 import RoomDialog from './components/RoomDialog.vue';
@@ -194,19 +203,19 @@ const dormOptions = ref<DormTreeNode[]>([]);
 const selectedBuilding = ref<DormTreeNode>();
 
 // 房间数据
-const roomList = ref<RoomInfo[]>([]);
+const roomList = ref<DormRoomVO[]>([]);
 const floorList = computed(() => {
   if (!selectedBuilding.value?.buildingFloors) return [];
   return Array.from({ length: selectedBuilding.value.buildingFloors }, (_, i) => i + 1);
 });
 
 // 查询参数
-const queryParams = reactive<DormQuery>({
+const queryParams = reactive<DormRoomQuery>({
   pageNum: 1,
   pageSize: 100,
   buildingId: undefined,
   roomName: '',
-  status: undefined
+  roomStatus: undefined
 });
 
 // 房间对话框
@@ -214,8 +223,9 @@ const roomDialog = reactive({
   visible: false,
   title: '',
   roomId: undefined as string | number | undefined,
-  floorNumber: 1,
+  floorNum: 1,
-  buildingId: '' as string | number
+  buildingId: '' as string | number,
+  room: undefined as DormRoomVO | undefined
 });
 
 // 床位管理对话框
@@ -280,8 +290,8 @@ const loadRoomData = async () => {
   if (!queryParams.buildingId) return;
 
   try {
-    const res = await listRooms(queryParams);
+    const res = await listDormRoom(queryParams);
-    roomList.value = res.rows;
+    roomList.value = res?.rows;
   } catch (error) {
     console.error('获取房间列表失败', error);
   }
@@ -289,7 +299,7 @@ const loadRoomData = async () => {
 
 /** 根据楼层获取房间数据 */
 const getRoomsByFloor = (floor: number) => {
-  return roomList.value.filter((room) => room.floorNumber === floor);
+  return roomList.value.filter((room) => room.floorNum === floor);
 };
 
 /** 搜索按钮操作 */
@@ -303,32 +313,40 @@ const resetQuery = () => {
   queryFormRef.value?.resetFields();
   queryParams.pageNum = 1;
   queryParams.roomName = '';
-  queryParams.status = undefined;
+  queryParams.roomStatus = undefined;
   handleQuery();
 };
 
 /** 添加房间 */
 const handleAddRoom = (floor: number) => {
   if (!selectedBuilding.value) return;
+  // console.log(floor);
 
+  // 完全重置房间对话框的状态
   roomDialog.title = '添加房间';
   roomDialog.roomId = undefined;
-  roomDialog.floorNumber = floor;
+  roomDialog.floorNum = floor;
   roomDialog.buildingId = selectedBuilding.value.id;
-  roomDialog.visible = true;
+  roomDialog.room = undefined; // 确保清除之前的房间数据
+
+  // 延迟显示对话框，确保状态已完全重置
+  nextTick(() => {
+    roomDialog.visible = true;
+  });
 };
 
 /** 编辑房间 */
-const handleEditRoom = (room: RoomInfo) => {
+const handleEditRoom = (room: DormRoomVO) => {
   roomDialog.title = '编辑房间';
-  roomDialog.roomId = room.roomId;
+  roomDialog.roomId = room.id;
-  roomDialog.floorNumber = room.floorNumber;
+  roomDialog.floorNum = room.floorNum;
   roomDialog.buildingId = room.buildingId;
+  roomDialog.room = room; // 将完整房间对象传递给对话框
   roomDialog.visible = true;
 };
 
 /** 删除房间 */
-const handleDeleteRoom = (row: RoomInfo) => {
+const handleDeleteRoom = (row: DormRoomVO) => {
   ElMessageBox.confirm(`确定要删除房间 ${row.roomName} 吗？`, '警告', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
@@ -336,8 +354,7 @@ const handleDeleteRoom = (row: RoomInfo) => {
   })
     .then(async () => {
       try {
-        // await delRoom(row.roomId);
+        await delDormRoom(row.id);
-        // 模拟删除成功
         ElMessage.success('删除成功');
         loadRoomData();
       } catch (error) {
@@ -353,12 +370,12 @@ const handleRoomSuccess = () => {
 };
 
 /** 管理床位 */
-const handleManageBeds = async (room: RoomInfo) => {
+const handleManageBeds = async (room: DormRoomVO) => {
-  bedManageDialog.roomId = room.roomId;
+  bedManageDialog.roomId = room.id;
   bedManageDialog.roomName = room.roomName;
   bedManageDialog.visible = true;
 
-  await loadBedData(room.roomId);
+  await loadBedData(room.id);
 };
 
 /** 加载床位数据 */