寝室号生成规则管理

src/main/java/com/xjrsoft/module/room/controller/RoomRuleController.java

@@ -0,0 +1,101 @@
+package com.xjrsoft.module.room.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.module.room.dto.AddRoomRuleDto;
+import com.xjrsoft.module.room.dto.AddRoomRuleItemDto;
+import com.xjrsoft.module.room.dto.RoomRulePageDto;
+import com.xjrsoft.module.room.dto.UpdateRoomRuleDto;
+import com.xjrsoft.module.room.entity.RoomRule;
+import com.xjrsoft.module.room.service.IRoomRuleService;
+import com.xjrsoft.module.room.vo.RoomRulePageVo;
+import com.xjrsoft.module.room.vo.RoomRuleVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+* @title: 寝室生成规则
+* @Author dzx
+* @Date: 2024-01-02
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/room" + "/roomRule")
+@Api(value = "/room"  + "/roomRule",tags = "寝室生成规则代码")
+@AllArgsConstructor
+public class RoomRuleController {
+
+
+    private final IRoomRuleService roomRuleService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="寝室生成规则列表(分页)")
+    @SaCheckPermission("roomrule:detail")
+    public RT<PageOutput<RoomRulePageVo>> page(@Valid RoomRulePageDto dto){
+        Page<RoomRulePageVo> page = roomRuleService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
+        PageOutput<RoomRulePageVo> pageOutput = ConventPage.getPageOutput(page, RoomRulePageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询寝室生成规则信息")
+    @SaCheckPermission("roomrule:detail")
+    public RT<RoomRuleVo> info(@RequestParam Long id){
+        RoomRule roomRule = roomRuleService.getByIdDeep(id);
+        if (roomRule == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(roomRule, RoomRuleVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增寝室生成规则")
+    @SaCheckPermission("roomrule:add")
+    public RT<Boolean> add(@Valid @RequestBody AddRoomRuleDto dto){
+        RoomRule roomRule = BeanUtil.toBean(dto, RoomRule.class);
+        boolean isSuccess = roomRuleService.add(roomRule);
+        return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改寝室生成规则")
+    @SaCheckPermission("roomrule:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateRoomRuleDto dto){
+
+        RoomRule roomRule = BeanUtil.toBean(dto, RoomRule.class);
+        return RT.ok(roomRuleService.update(roomRule));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除寝室生成规则")
+    @SaCheckPermission("roomrule:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(roomRuleService.delete(ids));
+    }
+
+    @PostMapping(value="/bind-builds")
+    @ApiOperation(value = "绑定楼栋")
+    @SaCheckPermission("roomrule:edit")
+    public RT<Boolean> bindBuilds(@Valid @RequestBody AddRoomRuleItemDto dto){
+        return RT.ok(roomRuleService.bindBuilds(dto));
+    }
+
+}

src/main/java/com/xjrsoft/module/room/dto/AddRoomRuleDto.java

@@ -0,0 +1,37 @@
+package com.xjrsoft.module.room.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+
+/**
+* @title: 寝室生成规则
+* @Author dzx
+* @Date: 2024-01-02
+* @Version 1.0
+*/
+@Data
+public class AddRoomRuleDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 规则名称
+    */
+    @ApiModelProperty("规则名称")
+    private String name;
+    /**
+    * 规则配置（多个规则用逗号隔开）
+    */
+    @ApiModelProperty("规则配置（多个规则用逗号隔开，1为楼栋，2为楼层，3为寝室号）")
+    private String rule;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

src/main/java/com/xjrsoft/module/room/dto/AddRoomRuleItemDto.java

@@ -0,0 +1,32 @@
+package com.xjrsoft.module.room.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+* @title: 寝室生成规则项
+* @Author dzx
+* @Date: 2024-01-02
+* @Version 1.0
+*/
+@Data
+public class AddRoomRuleItemDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 寝室生成规则编号(room_rule)
+    */
+    @ApiModelProperty("寝室生成规则编号(room_rule)")
+    private Long roomRuleId;
+    /**
+    * 楼栋(base_office_build)
+    */
+    @ApiModelProperty("楼栋(base_office_build)")
+    private List<Long> officeBuildIds;
+
+}

src/main/java/com/xjrsoft/module/room/dto/RoomRulePageDto.java

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.room.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 寝室生成规则分页查询入参
+* @Author dzx
+* @Date: 2024-01-02
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class RoomRulePageDto extends PageInput {
+
+
+}

src/main/java/com/xjrsoft/module/room/dto/UpdateRoomRuleDto.java

@@ -0,0 +1,24 @@
+package com.xjrsoft.module.room.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+
+/**
+* @title: 寝室生成规则
+* @Author dzx
+* @Date: 2024-01-02
+* @Version 1.0
+*/
+@Data
+public class UpdateRoomRuleDto extends AddRoomRuleDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/room/entity/RoomRule.java

@@ -0,0 +1,103 @@
+package com.xjrsoft.module.room.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+* @title: 寝室生成规则
+* @Author dzx
+* @Date: 2024-01-02
+* @Version 1.0
+*/
+@Data
+@TableName("room_rule")
+@ApiModel(value = "room_rule", description = "寝室生成规则")
+public class RoomRule implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 规则名称
+    */
+    @ApiModelProperty("规则名称")
+    private String name;
+    /**
+    * 规则配置（多个规则用逗号隔开）
+    */
+    @ApiModelProperty("规则配置（多个规则用逗号隔开）")
+    private String rule;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+    /**
+    * roomRuleItem
+    */
+    @ApiModelProperty("roomRuleItem子表")
+    @TableField(exist = false)
+    @EntityMapping(thisField = "id", joinField = "roomRuleId")
+    private List<RoomRuleItem> roomRuleItemList;
+
+}

src/main/java/com/xjrsoft/module/room/entity/RoomRuleItem.java

@@ -0,0 +1,89 @@
+package com.xjrsoft.module.room.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+* @title: 寝室生成规则项
+* @Author dzx
+* @Date: 2024-01-02
+* @Version 1.0
+*/
+@Data
+@TableName("room_rule_item")
+@ApiModel(value = "room_rule_item", description = "寝室生成规则项")
+public class RoomRuleItem implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 寝室生成规则编号(room_rule)
+    */
+    @ApiModelProperty("寝室生成规则编号(room_rule)")
+    private Long roomRuleId;
+    /**
+    * 楼栋(base_office_build)
+    */
+    @ApiModelProperty("楼栋(base_office_build)")
+    private Long officeBuildId;
+
+
+}

src/main/java/com/xjrsoft/module/room/mapper/RoomRuleItemMapper.java

@@ -0,0 +1,16 @@
+package com.xjrsoft.module.room.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.room.entity.RoomRuleItem;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 寝室生成规则项
+* @Author dzx
+* @Date: 2024-01-02
+* @Version 1.0
+*/
+@Mapper
+public interface RoomRuleItemMapper extends MPJBaseMapper<RoomRuleItem> {
+
+}

src/main/java/com/xjrsoft/module/room/mapper/RoomRuleMapper.java

@@ -0,0 +1,29 @@
+package com.xjrsoft.module.room.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.room.dto.RoomRulePageDto;
+import com.xjrsoft.module.room.entity.RoomRule;
+import com.xjrsoft.module.room.vo.RoomRulePageVo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 寝室生成规则
+* @Author dzx
+* @Date: 2024-01-02
+* @Version 1.0
+*/
+@Mapper
+public interface RoomRuleMapper extends MPJBaseMapper<RoomRule> {
+    /**
+     * 分页查询
+     * @param page
+     * @param dto
+     * @return
+     */
+    Page<RoomRulePageVo> getPage(Page<RoomRulePageDto> page, RoomRulePageDto dto);
+
+    Integer getMaxSortCode();
+
+    Integer getItemMaxSortCode();
+}

src/main/java/com/xjrsoft/module/room/service/IRoomRuleService.java

@@ -0,0 +1,54 @@
+package com.xjrsoft.module.room.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.room.dto.AddRoomRuleItemDto;
+import com.xjrsoft.module.room.dto.RoomRulePageDto;
+import com.xjrsoft.module.room.entity.RoomRule;
+import com.xjrsoft.module.room.vo.RoomRulePageVo;
+
+import java.util.List;
+
+/**
+* @title: 寝室生成规则
+* @Author dzx
+* @Date: 2024-01-02
+* @Version 1.0
+*/
+
+public interface IRoomRuleService extends MPJBaseService<RoomRule> {
+    /**
+    * 新增
+    *
+    * @param roomRule
+    * @return
+    */
+    Boolean add(RoomRule roomRule);
+
+    /**
+    * 更新
+    *
+    * @param roomRule
+    * @return
+    */
+    Boolean update(RoomRule roomRule);
+
+    /**
+    * 删除
+    *
+    * @param ids
+    * @return
+    */
+    Boolean delete(List<Long> ids);
+
+
+    /**
+     * 分页查询
+     * @param page
+     * @param dto
+     * @return
+     */
+    Page<RoomRulePageVo> getPage(Page<RoomRulePageDto> page, RoomRulePageDto dto);
+
+    Boolean bindBuilds(AddRoomRuleItemDto dto);
+}

src/main/java/com/xjrsoft/module/room/service/impl/RoomRuleServiceImpl.java

@@ -0,0 +1,141 @@
+package com.xjrsoft.module.room.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.room.dto.AddRoomRuleItemDto;
+import com.xjrsoft.module.room.dto.RoomRulePageDto;
+import com.xjrsoft.module.room.entity.RoomRule;
+import com.xjrsoft.module.room.entity.RoomRuleItem;
+import com.xjrsoft.module.room.mapper.RoomRuleItemMapper;
+import com.xjrsoft.module.room.mapper.RoomRuleMapper;
+import com.xjrsoft.module.room.service.IRoomRuleService;
+import com.xjrsoft.module.room.vo.RoomRulePageVo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+* @title: 寝室生成规则
+* @Author dzx
+* @Date: 2024-01-02
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class RoomRuleServiceImpl extends MPJBaseServiceImpl<RoomRuleMapper, RoomRule> implements IRoomRuleService {
+    private final RoomRuleMapper roomRuleRoomRuleMapper;
+
+    private final RoomRuleItemMapper roomRuleRoomRuleItemMapper;
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean add(RoomRule roomRule) {
+        roomRule.setSortCode(roomRuleRoomRuleMapper.getMaxSortCode() + 1);
+        roomRuleRoomRuleMapper.insert(roomRule);
+//        for (RoomRuleItem roomRuleItem : roomRule.getRoomRuleItemList()) {
+//            roomRuleItem.setRoomRuleId(roomRule.getId());
+//            roomRuleRoomRuleItemMapper.insert(roomRuleItem);
+//        }
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean update(RoomRule roomRule) {
+        roomRuleRoomRuleMapper.updateById(roomRule);
+        //********************************* RoomRuleItem  增删改  开始 *******************************************/
+        {
+            // 查出所有子级的id
+            List<RoomRuleItem> roomRuleItemList = roomRuleRoomRuleItemMapper.selectList(Wrappers.lambdaQuery(RoomRuleItem.class).eq(RoomRuleItem::getRoomRuleId, roomRule.getId()).select(RoomRuleItem::getId));
+            List<Long> roomRuleItemIds = roomRuleItemList.stream().map(RoomRuleItem::getId).collect(Collectors.toList());
+            //原有子表单 没有被删除的主键
+            List<Long> roomRuleItemOldIds = roomRule.getRoomRuleItemList().stream().map(RoomRuleItem::getId).filter(Objects::nonNull).collect(Collectors.toList());
+            //找到需要删除的id
+            List<Long> roomRuleItemRemoveIds = roomRuleItemIds.stream().filter(item -> !roomRuleItemOldIds.contains(item)).collect(Collectors.toList());
+
+            for (RoomRuleItem roomRuleItem : roomRule.getRoomRuleItemList()) {
+                //如果不等于空则修改
+                if (roomRuleItem.getId() != null) {
+                    roomRuleRoomRuleItemMapper.updateById(roomRuleItem);
+                }
+                //如果等于空 则新增
+                else {
+                    //已经不存在的id 删除
+                    roomRuleItem.setRoomRuleId(roomRule.getId());
+                    roomRuleRoomRuleItemMapper.insert(roomRuleItem);
+                }
+            }
+            //已经不存在的id 删除
+            if(roomRuleItemRemoveIds.size() > 0){
+                roomRuleRoomRuleItemMapper.deleteBatchIds(roomRuleItemRemoveIds);
+            }
+        }
+        //********************************* RoomRuleItem  增删改  结束 *******************************************/
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(List<Long> ids) {
+        roomRuleRoomRuleMapper.deleteBatchIds(ids);
+        roomRuleRoomRuleItemMapper.delete(Wrappers.lambdaQuery(RoomRuleItem.class).in(RoomRuleItem::getRoomRuleId, ids));
+
+        return true;
+    }
+
+    @Override
+    public Page<RoomRulePageVo> getPage(Page<RoomRulePageDto> page, RoomRulePageDto dto) {
+        Page<RoomRulePageVo> result = roomRuleRoomRuleMapper.getPage(page, dto);
+        List<RoomRulePageVo> records = result.getRecords();
+
+        for (RoomRulePageVo record : records) {
+            String[] ruleArray = record.getRule().split(",");
+            List<String> ruleList = Arrays.asList(ruleArray);
+            int houseNumber = 0;
+            if(ruleList.contains("1")){
+                houseNumber  = houseNumber + 1;
+            }
+            if(ruleList.contains("2")){
+                houseNumber  = houseNumber + 1;
+            }
+            if(ruleList.contains("3")){
+                houseNumber  = houseNumber + 2;
+            }
+            record.setHouseNumber(houseNumber + "位");
+        }
+        return result;
+    }
+
+    /**
+     * 绑定楼栋
+     * @param dto
+     * @return
+     */
+    @Override
+    public Boolean bindBuilds(AddRoomRuleItemDto dto) {
+        //先清空之前的数据
+        roomRuleRoomRuleItemMapper.delete(new QueryWrapper<RoomRuleItem>().lambda().eq(RoomRuleItem::getRoomRuleId, dto.getRoomRuleId()));
+        //再插入最新传入的楼栋
+        Integer itemMaxSortCode = roomRuleRoomRuleMapper.getItemMaxSortCode();
+        for (Long buildId : dto.getOfficeBuildIds()) {
+            RoomRuleItem roomRuleItem = new RoomRuleItem();
+            itemMaxSortCode ++;
+            roomRuleItem.setSortCode(itemMaxSortCode);
+            roomRuleItem.setRoomRuleId(dto.getRoomRuleId());
+            roomRuleItem.setOfficeBuildId(buildId);
+
+            roomRuleRoomRuleItemMapper.insert(roomRuleItem);
+        }
+        return true;
+    }
+}

src/main/java/com/xjrsoft/module/room/vo/RoomRuleItemVo.java

@@ -0,0 +1,38 @@
+package com.xjrsoft.module.room.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 寝室生成规则项表单出参
+* @Author dzx
+* @Date: 2024-01-02
+* @Version 1.0
+*/
+@Data
+public class RoomRuleItemVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 寝室生成规则编号(room_rule)
+    */
+    @ApiModelProperty("寝室生成规则编号(room_rule)")
+    private Long roomRuleId;
+    /**
+    * 楼栋(base_office_build)
+    */
+    @ApiModelProperty("楼栋(base_office_build)")
+    private Long officeBuildId;
+
+
+
+}

src/main/java/com/xjrsoft/module/room/vo/RoomRulePageVo.java

@@ -0,0 +1,46 @@
+package com.xjrsoft.module.room.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 寝室生成规则分页列表出参
+* @Author dzx
+* @Date: 2024-01-02
+* @Version 1.0
+*/
+@Data
+public class RoomRulePageVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 规则名称
+    */
+    @ApiModelProperty("规则名称")
+    private String name;
+    /**
+    * 规则配置（多个规则用逗号隔开）
+    */
+    @ApiModelProperty("规则配置（多个规则用逗号隔开）")
+    private String rule;
+    /**
+    * 绑定楼栋
+    */
+    @ApiModelProperty("绑定楼栋")
+    private String buildNames;
+
+    /**
+     * 门牌号
+     */
+    @ApiModelProperty("门牌号")
+    private String houseNumber;
+}

src/main/java/com/xjrsoft/module/room/vo/RoomRuleVo.java

@@ -0,0 +1,55 @@
+package com.xjrsoft.module.room.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+* @title: 寝室生成规则表单出参
+* @Author dzx
+* @Date: 2024-01-02
+* @Version 1.0
+*/
+@Data
+public class RoomRuleVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 楼层
+    */
+    @ApiModelProperty("楼层")
+    private Integer floorNumber;
+    /**
+    * 规则名称
+    */
+    @ApiModelProperty("规则名称")
+    private String name;
+    /**
+    * 规则配置（多个规则用逗号隔开）
+    */
+    @ApiModelProperty("规则配置（多个规则用逗号隔开）")
+    private String rule;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+    /**
+    * roomRuleItem
+    */
+    @ApiModelProperty("roomRuleItem子表")
+    private List<RoomRuleItemVo> roomRuleItemList;
+
+}