添加通知

db/add.sql

+-- ----------------------------
+2023-09-04
+-- ----------------------------
+ALTER TABLE mortals_xhx_room ADD COLUMN   `fileName` varchar(256)  default ''    COMMENT '文件名称';
+ALTER TABLE mortals_xhx_room ADD COLUMN   `filePath` varchar(256)  default ''    COMMENT '文件相对路径地址';
+
+-- ----------------------------
+-- 通知公告表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_notice`;
+CREATE TABLE mortals_xhx_notice(
+    `id` bigint(20)   AUTO_INCREMENT   COMMENT '主键ID，主键，自增长',
+    `title` varchar(256) NOT NULL     COMMENT '标题',
+    `noticeContent` mediumtext      COMMENT '公告内容',
+    `filePath` varchar(512)      COMMENT '公告文件路径',
+    `fileName` varchar(512)      COMMENT '公告文件名称',
+    `remark` varchar(256)      COMMENT '备注',
+    `createUserId` bigint(20) NOT NULL     COMMENT '创建用户',
+    `createTime` datetime NOT NULL     COMMENT '创建时间',
+    `updateUserId` bigint(20)      COMMENT '更新用户',
+    `updateTime` datetime      COMMENT '更新时间',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='通知公告';
+-- ----------------------------
+-- 房间公告表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_notice_room`;
+CREATE TABLE mortals_xhx_notice_room(
+    `id` bigint(20)   AUTO_INCREMENT   COMMENT '主键ID，主键，自增长',
+    `noticeId` bigint(20)      COMMENT '公告id',
+    `title` varchar(256) NOT NULL     COMMENT '公告标题',
+    `roomId` bigint(20)      COMMENT '房间id',
+    `roomName` varchar(256) NOT NULL     COMMENT '房间名称',
+    `remark` varchar(256)      COMMENT '备注',
+    `createUserId` bigint(20) NOT NULL     COMMENT '创建用户',
+    `createTime` datetime NOT NULL     COMMENT '创建时间',
+    `updateUserId` bigint(20)      COMMENT '更新用户',
+    `updateTime` datetime      COMMENT '更新时间',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='房间公告';
+
+
+-- ----------------------------
+-- 通知公告菜单 SQL
+-- ----------------------------
+INSERT INTO `mortals_xhx_menu` VALUES (null, '通知公告', '/notice/list', 0,'', 1, 1, 0, 0,'',NULL, NULL, NULL, 0, 0, 1, NULL, NULL, NULL);
+
+-- ----------------------------
+-- 通知公告资源路径 SQL
+-- ----------------------------
+INSERT INTO `mortals_xhx_resource` VALUES (null, '通知公告-菜单管理-查看', '/notice/list,/notice/view,/notice/info,/notice/export,/notice/exportExcel,/notice/downloadTemplate,/notice/download', 3, 0, NULL, NULL, NULL, 0);
+INSERT INTO `mortals_xhx_resource` VALUES (null, '通知公告-菜单管理-维护', '/notice/add,/notice/edit,/notice/delete,/notice/logicDelete,/notice/save,/notice/importData', 3, 0, NULL, NULL, NULL, 0);
+
+-- ----------------------------
+-- 通知公告参数 SQL
+-- ----------------------------
+-- ----------------------------
+-- 房间公告菜单 SQL
+-- ----------------------------
+INSERT INTO `mortals_xhx_menu` VALUES (null, '房间公告', '/notice/room/list', 0,'', 1, 1, 0, 0,'',NULL, NULL, NULL, 0, 0, 1, NULL, NULL, NULL);
+
+-- ----------------------------
+-- 房间公告资源路径 SQL
+-- ----------------------------
+INSERT INTO `mortals_xhx_resource` VALUES (null, '房间公告-菜单管理-查看', '/notice/room/list,/notice/room/view,/notice/room/info,/notice/room/export,/notice/room/exportExcel,/notice/room/downloadTemplate,/notice/room/download', 3, 0, NULL, NULL, NULL, 0);
+INSERT INTO `mortals_xhx_resource` VALUES (null, '房间公告-菜单管理-维护', '/notice/room/add,/notice/room/edit,/notice/room/delete,/notice/room/logicDelete,/notice/room/save,/notice/room/importData', 3, 0, NULL, NULL, NULL, 0);
+
+

smart-office-manager-ui/admin/src/router.js

@@ -49,6 +49,9 @@ const router = new Router({
 
                 ...restBuilder('basic/set', 'basic/set'),//基础设置
 
+                ...restBuilder('notice', 'notice'),//通知公告
+                ...restBuilder('room/notice', 'room/notice'),//房间所属公告
+
                 //以下为基础路由配置
                 builder('', 'Home'),
                 builder('index', 'Home'),

smart-office-manager-ui/admin/src/views/room/drawershow.vue

@@ -11,6 +11,8 @@
                             <Field :span="20" label="房间编码" prop="roomCode" v-model="form.roomCode" placeholder="请输入房间编码"/>
                             <Field :span="20" label="房间类型" prop="roomType" v-model="form.roomType"  type="select" :enumData="dict.roomType" placeholder="请选择房间类型"/>
                             <Field :span="20" label="关联设备" prop="deviceId" v-model="deviceIds" type="select" :multiple="true" :enumData="dict.deviceIds" placeholder="请选择绑定的电子门牌的设备ID"/>
+
+                            <Field label="附件"><fileUpload v-model="form.filePath"  prePath="/file/fileupload"/></Field>
                             <Field :span="20" label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/>
 
             </el-row>

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/dao/NoticeDao.java

+package com.mortals.xhx.module.notice.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.notice.model.NoticeEntity;
+import java.util.List;
+/**
+* 通知公告Dao
+* 通知公告 DAO接口
+*
+* @author zxfei
+* @date 2023-09-04
+*/
+
+public interface  NoticeDao extends ICRUDDao<NoticeEntity,Long>{
+
+
+}

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/dao/NoticeRoomDao.java

+package com.mortals.xhx.module.notice.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.notice.model.NoticeRoomEntity;
+import java.util.List;
+/**
+* 房间公告Dao
+* 房间公告 DAO接口
+*
+* @author zxfei
+* @date 2023-09-04
+*/
+
+public interface  NoticeRoomDao extends ICRUDDao<NoticeRoomEntity,Long>{
+
+
+}

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/dao/ibatis/NoticeDaoImpl.java

+package com.mortals.xhx.module.notice.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.notice.dao.NoticeDao;
+import com.mortals.xhx.module.notice.model.NoticeEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 通知公告DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2023-09-04
+*/
+@Repository("noticeDao")
+public class NoticeDaoImpl extends BaseCRUDDaoMybatis<NoticeEntity,Long> implements NoticeDao {
+
+
+
+}

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/dao/ibatis/NoticeRoomDaoImpl.java

+package com.mortals.xhx.module.notice.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.notice.dao.NoticeRoomDao;
+import com.mortals.xhx.module.notice.model.NoticeRoomEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 房间公告DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2023-09-04
+*/
+@Repository("noticeRoomDao")
+public class NoticeRoomDaoImpl extends BaseCRUDDaoMybatis<NoticeRoomEntity,Long> implements NoticeRoomDao {
+
+
+
+}

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/model/NoticeEntity.java

+package com.mortals.xhx.module.notice.model;
+import java.util.List;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+import cn.hutool.core.date.DateUtil;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.notice.model.vo.NoticeVo;
+import com.mortals.xhx.module.notice.model.NoticeRoomEntity;
+import lombok.Data;
+/**
+* 通知公告实体对象
+*
+* @author zxfei
+* @date 2023-09-04
+*/
+@Data
+public class NoticeEntity extends NoticeVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 标题
+    */
+    @Excel(name = "标题")
+    private String title;
+    /**
+    * 公告内容
+    */
+    private String noticeContent;
+    /**
+    * 公告文件路径
+    */
+    private String filePath;
+    /**
+    * 公告文件名称
+    */
+    private String fileName;
+    /**
+    * 备注
+    */
+    private String remark;
+    /**
+    * 房间公告信息
+    */
+    private List<NoticeRoomEntity> noticeRoomList=new ArrayList<>();;
+    public List<NoticeRoomEntity> getNoticeRoomList(){
+      return noticeRoomList;
+    }
+
+    public void setNoticeRoomList(List<NoticeRoomEntity> noticeRoomList){
+        this.noticeRoomList = noticeRoomList;
+    }
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof NoticeEntity) {
+            NoticeEntity tmp = (NoticeEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+            this.title = "";
+            this.noticeContent = "";
+            this.filePath = "";
+            this.fileName = "";
+            this.remark = "";
+    }
+}
\ No newline at end of file

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/model/NoticeQuery.java

+package com.mortals.xhx.module.notice.model;
+
+import java.util.List;
+import java.util.List;
+import com.mortals.xhx.module.notice.model.NoticeEntity;
+/**
+* 通知公告查询对象
+*
+* @author zxfei
+* @date 2023-09-04
+*/
+public class NoticeQuery extends NoticeEntity {
+    /** 开始 主键ID，主键，自增长 */
+    private Long idStart;
+
+    /** 结束 主键ID，主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 主键ID，主键，自增长 */
+    private Long idIncrement;
+
+    /** 主键ID，主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 主键ID，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
+    /** 标题 */
+    private List<String> titleList;
+
+    /** 标题排除列表 */
+    private List <String> titleNotList;
+    /** 公告内容 */
+    private List<String> noticeContentList;
+
+    /** 公告内容排除列表 */
+    private List <String> noticeContentNotList;
+    /** 公告文件路径 */
+    private List<String> filePathList;
+
+    /** 公告文件路径排除列表 */
+    private List <String> filePathNotList;
+    /** 公告文件名称 */
+    private List<String> fileNameList;
+
+    /** 公告文件名称排除列表 */
+    private List <String> fileNameNotList;
+    /** 备注 */
+    private List<String> remarkList;
+
+    /** 备注排除列表 */
+    private List <String> remarkNotList;
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 创建用户排除列表 */
+    private List <Long> createUserIdNotList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 更新用户 */
+    private Long updateUserIdStart;
+
+    /** 结束 更新用户 */
+    private Long updateUserIdEnd;
+
+    /** 增加 更新用户 */
+    private Long updateUserIdIncrement;
+
+    /** 更新用户列表 */
+    private List <Long> updateUserIdList;
+
+    /** 更新用户排除列表 */
+    private List <Long> updateUserIdNotList;
+
+    /** 开始 更新时间 */
+    private String updateTimeStart;
+
+    /** 结束 更新时间 */
+    private String updateTimeEnd;
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<NoticeQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<NoticeQuery> andConditionList;
+
+    public NoticeQuery(){}
+
+    /**
+    * 获取 开始 主键ID，主键，自增长
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 主键ID，主键，自增长
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 主键ID，主键，自增长
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 主键ID，主键，自增长
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 主键ID，主键，自增长
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 主键ID，主键，自增长
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 主键ID，主键，自增长
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 主键ID，主键，自增长
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 主键ID，主键，自增长
+    * @return idNotList
+    */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+    * 设置 主键ID，主键，自增长
+    * @param idNotList
+    */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
+    /**
+    * 获取 标题
+    * @return titleList
+    */
+    public List<String> getTitleList(){
+        return this.titleList;
+    }
+
+    /**
+    * 设置 标题
+    * @param titleList
+    */
+    public void setTitleList(List<String> titleList){
+        this.titleList = titleList;
+    }
+
+    /**
+    * 获取 标题
+    * @return titleNotList
+    */
+    public List<String> getTitleNotList(){
+        return this.titleNotList;
+    }
+
+    /**
+    * 设置 标题
+    * @param titleNotList
+    */
+    public void setTitleNotList(List<String> titleNotList){
+        this.titleNotList = titleNotList;
+    }
+
+    /**
+    * 获取 公告内容
+    * @return noticeContentList
+    */
+    public List<String> getNoticeContentList(){
+        return this.noticeContentList;
+    }
+
+    /**
+    * 设置 公告内容
+    * @param noticeContentList
+    */
+    public void setNoticeContentList(List<String> noticeContentList){
+        this.noticeContentList = noticeContentList;
+    }
+
+    /**
+    * 获取 公告内容
+    * @return noticeContentNotList
+    */
+    public List<String> getNoticeContentNotList(){
+        return this.noticeContentNotList;
+    }
+
+    /**
+    * 设置 公告内容
+    * @param noticeContentNotList
+    */
+    public void setNoticeContentNotList(List<String> noticeContentNotList){
+        this.noticeContentNotList = noticeContentNotList;
+    }
+
+    /**
+    * 获取 公告文件路径
+    * @return filePathList
+    */
+    public List<String> getFilePathList(){
+        return this.filePathList;
+    }
+
+    /**
+    * 设置 公告文件路径
+    * @param filePathList
+    */
+    public void setFilePathList(List<String> filePathList){
+        this.filePathList = filePathList;
+    }
+
+    /**
+    * 获取 公告文件路径
+    * @return filePathNotList
+    */
+    public List<String> getFilePathNotList(){
+        return this.filePathNotList;
+    }
+
+    /**
+    * 设置 公告文件路径
+    * @param filePathNotList
+    */
+    public void setFilePathNotList(List<String> filePathNotList){
+        this.filePathNotList = filePathNotList;
+    }
+
+    /**
+    * 获取 公告文件名称
+    * @return fileNameList
+    */
+    public List<String> getFileNameList(){
+        return this.fileNameList;
+    }
+
+    /**
+    * 设置 公告文件名称
+    * @param fileNameList
+    */
+    public void setFileNameList(List<String> fileNameList){
+        this.fileNameList = fileNameList;
+    }
+
+    /**
+    * 获取 公告文件名称
+    * @return fileNameNotList
+    */
+    public List<String> getFileNameNotList(){
+        return this.fileNameNotList;
+    }
+
+    /**
+    * 设置 公告文件名称
+    * @param fileNameNotList
+    */
+    public void setFileNameNotList(List<String> fileNameNotList){
+        this.fileNameNotList = fileNameNotList;
+    }
+
+    /**
+    * 获取 备注
+    * @return remarkList
+    */
+    public List<String> getRemarkList(){
+        return this.remarkList;
+    }
+
+    /**
+    * 设置 备注
+    * @param remarkList
+    */
+    public void setRemarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+    }
+
+    /**
+    * 获取 备注
+    * @return remarkNotList
+    */
+    public List<String> getRemarkNotList(){
+        return this.remarkNotList;
+    }
+
+    /**
+    * 设置 备注
+    * @param remarkNotList
+    */
+    public void setRemarkNotList(List<String> remarkNotList){
+        this.remarkNotList = remarkNotList;
+    }
+
+    /**
+    * 获取 开始 创建用户
+    * @return createUserIdStart
+    */
+    public Long getCreateUserIdStart(){
+        return this.createUserIdStart;
+    }
+
+    /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public void setCreateUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
+    }
+
+    /**
+    * 获取 结束 创建用户
+    * @return $createUserIdEnd
+    */
+    public Long getCreateUserIdEnd(){
+        return this.createUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public void setCreateUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 创建用户
+    * @return createUserIdIncrement
+    */
+    public Long getCreateUserIdIncrement(){
+        return this.createUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public void setCreateUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdList
+    */
+    public List<Long> getCreateUserIdList(){
+        return this.createUserIdList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public void setCreateUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdNotList
+    */
+    public List<Long> getCreateUserIdNotList(){
+        return this.createUserIdNotList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdNotList
+    */
+    public void setCreateUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+    }
+
+
+    /**
+    * 获取 开始 创建时间
+    * @return createTimeStart
+    */
+    public String getCreateTimeStart(){
+        return this.createTimeStart;
+    }
+
+    /**
+    * 设置 开始 创建时间
+    * @param createTimeStart
+    */
+    public void setCreateTimeStart(String createTimeStart){
+        this.createTimeStart = createTimeStart;
+    }
+
+    /**
+    * 获取 结束 创建时间
+    * @return createTimeEnd
+    */
+    public String getCreateTimeEnd(){
+        return this.createTimeEnd;
+    }
+
+    /**
+    * 设置 结束 创建时间
+    * @param createTimeEnd
+    */
+    public void setCreateTimeEnd(String createTimeEnd){
+        this.createTimeEnd = createTimeEnd;
+    }
+
+    /**
+    * 获取 开始 更新用户
+    * @return updateUserIdStart
+    */
+    public Long getUpdateUserIdStart(){
+        return this.updateUserIdStart;
+    }
+
+    /**
+    * 设置 开始 更新用户
+    * @param updateUserIdStart
+    */
+    public void setUpdateUserIdStart(Long updateUserIdStart){
+        this.updateUserIdStart = updateUserIdStart;
+    }
+
+    /**
+    * 获取 结束 更新用户
+    * @return $updateUserIdEnd
+    */
+    public Long getUpdateUserIdEnd(){
+        return this.updateUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 更新用户
+    * @param updateUserIdEnd
+    */
+    public void setUpdateUserIdEnd(Long updateUserIdEnd){
+        this.updateUserIdEnd = updateUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 更新用户
+    * @return updateUserIdIncrement
+    */
+    public Long getUpdateUserIdIncrement(){
+        return this.updateUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 更新用户
+    * @param updateUserIdIncrement
+    */
+    public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
+        this.updateUserIdIncrement = updateUserIdIncrement;
+    }
+
+    /**
+    * 获取 更新用户
+    * @return updateUserIdList
+    */
+    public List<Long> getUpdateUserIdList(){
+        return this.updateUserIdList;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdList
+    */
+    public void setUpdateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+    }
+
+    /**
+    * 获取 更新用户
+    * @return updateUserIdNotList
+    */
+    public List<Long> getUpdateUserIdNotList(){
+        return this.updateUserIdNotList;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdNotList
+    */
+    public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
+    }
+
+
+    /**
+    * 获取 开始 更新时间
+    * @return updateTimeStart
+    */
+    public String getUpdateTimeStart(){
+        return this.updateTimeStart;
+    }
+
+    /**
+    * 设置 开始 更新时间
+    * @param updateTimeStart
+    */
+    public void setUpdateTimeStart(String updateTimeStart){
+        this.updateTimeStart = updateTimeStart;
+    }
+
+    /**
+    * 获取 结束 更新时间
+    * @return updateTimeEnd
+    */
+    public String getUpdateTimeEnd(){
+        return this.updateTimeEnd;
+    }
+
+    /**
+    * 设置 结束 更新时间
+    * @param updateTimeEnd
+    */
+    public void setUpdateTimeEnd(String updateTimeEnd){
+        this.updateTimeEnd = updateTimeEnd;
+    }
+
+    /**
+    * 设置  主键ID，主键，自增长
+    * @param id
+    */
+    public NoticeQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 主键ID，主键，自增长
+    * @param idStart
+    */
+    public NoticeQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 主键ID，主键，自增长
+    * @param idEnd
+    */
+    public NoticeQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 主键ID，主键，自增长
+    * @param idIncrement
+    */
+    public NoticeQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 主键ID，主键，自增长
+    * @param idList
+    */
+    public NoticeQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+        /**
+        * 设置 主键ID，主键，自增长
+        * @param idNotList
+        */
+        public NoticeQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 标题
+    * @param title
+    */
+    public NoticeQuery title(String title){
+        setTitle(title);
+		return this;
+    }
+
+    /**
+    * 设置 标题
+    * @param titleList
+    */
+    public NoticeQuery titleList(List<String> titleList){
+        this.titleList = titleList;
+		return this;
+    }
+
+
+	/**
+    * 设置 公告内容
+    * @param noticeContent
+    */
+    public NoticeQuery noticeContent(String noticeContent){
+        setNoticeContent(noticeContent);
+		return this;
+    }
+
+    /**
+    * 设置 公告内容
+    * @param noticeContentList
+    */
+    public NoticeQuery noticeContentList(List<String> noticeContentList){
+        this.noticeContentList = noticeContentList;
+		return this;
+    }
+
+
+	/**
+    * 设置 公告文件路径
+    * @param filePath
+    */
+    public NoticeQuery filePath(String filePath){
+        setFilePath(filePath);
+		return this;
+    }
+
+    /**
+    * 设置 公告文件路径
+    * @param filePathList
+    */
+    public NoticeQuery filePathList(List<String> filePathList){
+        this.filePathList = filePathList;
+		return this;
+    }
+
+
+	/**
+    * 设置 公告文件名称
+    * @param fileName
+    */
+    public NoticeQuery fileName(String fileName){
+        setFileName(fileName);
+		return this;
+    }
+
+    /**
+    * 设置 公告文件名称
+    * @param fileNameList
+    */
+    public NoticeQuery fileNameList(List<String> fileNameList){
+        this.fileNameList = fileNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 备注
+    * @param remark
+    */
+    public NoticeQuery remark(String remark){
+        setRemark(remark);
+		return this;
+    }
+
+    /**
+    * 设置 备注
+    * @param remarkList
+    */
+    public NoticeQuery remarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+		return this;
+    }
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public NoticeQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public NoticeQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public NoticeQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public NoticeQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public NoticeQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 创建用户
+        * @param createUserIdNotList
+        */
+        public NoticeQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+        }
+
+
+    /**
+    * 设置  更新用户
+    * @param updateUserId
+    */
+    public NoticeQuery updateUserId(Long updateUserId){
+	    setUpdateUserId(updateUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 更新用户
+    * @param updateUserIdStart
+    */
+    public NoticeQuery updateUserIdStart(Long updateUserIdStart){
+		this.updateUserIdStart = updateUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 更新用户
+    * @param updateUserIdEnd
+    */
+    public NoticeQuery updateUserIdEnd(Long updateUserIdEnd){
+		this.updateUserIdEnd = updateUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 更新用户
+    * @param updateUserIdIncrement
+    */
+    public NoticeQuery updateUserIdIncrement(Long updateUserIdIncrement){
+		this.updateUserIdIncrement = updateUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdList
+    */
+    public NoticeQuery updateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 更新用户
+        * @param updateUserIdNotList
+        */
+        public NoticeQuery updateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
+        return this;
+        }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<NoticeQuery> getOrConditionList(){
+    return this.orConditionList;
+    }
+
+    /**
+    * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @param orConditionList
+    */
+    public void setOrConditionList(List<NoticeQuery> orConditionList){
+        this.orConditionList = orConditionList;
+    }
+
+    /**
+    * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @return andConditionList
+    */
+    public List<NoticeQuery> getAndConditionList(){
+        return this.andConditionList;
+    }
+
+    /**
+    * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @param andConditionList
+    */
+    public void setAndConditionList(List<NoticeQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/model/NoticeRoomEntity.java

+package com.mortals.xhx.module.notice.model;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+import cn.hutool.core.date.DateUtil;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.notice.model.vo.NoticeRoomVo;
+import lombok.Data;
+/**
+* 房间公告实体对象
+*
+* @author zxfei
+* @date 2023-09-04
+*/
+@Data
+public class NoticeRoomEntity extends NoticeRoomVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 公告id
+    */
+    private Long noticeId;
+    /**
+    * 公告标题
+    */
+    @Excel(name = "公告标题")
+    private String title;
+    /**
+    * 房间id
+    */
+    private Long roomId;
+    /**
+    * 房间名称
+    */
+    @Excel(name = "房间名称")
+    private String roomName;
+    /**
+    * 备注
+    */
+    private String remark;
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof NoticeRoomEntity) {
+            NoticeRoomEntity tmp = (NoticeRoomEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+            this.noticeId = 0L;
+            this.title = "";
+            this.roomId = 0L;
+            this.roomName = "";
+            this.remark = "";
+    }
+}
\ No newline at end of file

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/model/NoticeRoomQuery.java

+package com.mortals.xhx.module.notice.model;
+
+import java.util.List;
+import com.mortals.xhx.module.notice.model.NoticeRoomEntity;
+/**
+* 房间公告查询对象
+*
+* @author zxfei
+* @date 2023-09-04
+*/
+public class NoticeRoomQuery extends NoticeRoomEntity {
+    /** 开始 主键ID，主键，自增长 */
+    private Long idStart;
+
+    /** 结束 主键ID，主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 主键ID，主键，自增长 */
+    private Long idIncrement;
+
+    /** 主键ID，主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 主键ID，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
+    /** 开始 公告id */
+    private Long noticeIdStart;
+
+    /** 结束 公告id */
+    private Long noticeIdEnd;
+
+    /** 增加 公告id */
+    private Long noticeIdIncrement;
+
+    /** 公告id列表 */
+    private List <Long> noticeIdList;
+
+    /** 公告id排除列表 */
+    private List <Long> noticeIdNotList;
+
+    /** 公告标题 */
+    private List<String> titleList;
+
+    /** 公告标题排除列表 */
+    private List <String> titleNotList;
+    /** 开始 房间id */
+    private Long roomIdStart;
+
+    /** 结束 房间id */
+    private Long roomIdEnd;
+
+    /** 增加 房间id */
+    private Long roomIdIncrement;
+
+    /** 房间id列表 */
+    private List <Long> roomIdList;
+
+    /** 房间id排除列表 */
+    private List <Long> roomIdNotList;
+
+    /** 房间名称 */
+    private List<String> roomNameList;
+
+    /** 房间名称排除列表 */
+    private List <String> roomNameNotList;
+    /** 备注 */
+    private List<String> remarkList;
+
+    /** 备注排除列表 */
+    private List <String> remarkNotList;
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 创建用户排除列表 */
+    private List <Long> createUserIdNotList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 更新用户 */
+    private Long updateUserIdStart;
+
+    /** 结束 更新用户 */
+    private Long updateUserIdEnd;
+
+    /** 增加 更新用户 */
+    private Long updateUserIdIncrement;
+
+    /** 更新用户列表 */
+    private List <Long> updateUserIdList;
+
+    /** 更新用户排除列表 */
+    private List <Long> updateUserIdNotList;
+
+    /** 开始 更新时间 */
+    private String updateTimeStart;
+
+    /** 结束 更新时间 */
+    private String updateTimeEnd;
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<NoticeRoomQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<NoticeRoomQuery> andConditionList;
+
+    public NoticeRoomQuery(){}
+
+    /**
+    * 获取 开始 主键ID，主键，自增长
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 主键ID，主键，自增长
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 主键ID，主键，自增长
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 主键ID，主键，自增长
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 主键ID，主键，自增长
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 主键ID，主键，自增长
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 主键ID，主键，自增长
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 主键ID，主键，自增长
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 主键ID，主键，自增长
+    * @return idNotList
+    */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+    * 设置 主键ID，主键，自增长
+    * @param idNotList
+    */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
+    /**
+    * 获取 开始 公告id
+    * @return noticeIdStart
+    */
+    public Long getNoticeIdStart(){
+        return this.noticeIdStart;
+    }
+
+    /**
+    * 设置 开始 公告id
+    * @param noticeIdStart
+    */
+    public void setNoticeIdStart(Long noticeIdStart){
+        this.noticeIdStart = noticeIdStart;
+    }
+
+    /**
+    * 获取 结束 公告id
+    * @return $noticeIdEnd
+    */
+    public Long getNoticeIdEnd(){
+        return this.noticeIdEnd;
+    }
+
+    /**
+    * 设置 结束 公告id
+    * @param noticeIdEnd
+    */
+    public void setNoticeIdEnd(Long noticeIdEnd){
+        this.noticeIdEnd = noticeIdEnd;
+    }
+
+    /**
+    * 获取 增加 公告id
+    * @return noticeIdIncrement
+    */
+    public Long getNoticeIdIncrement(){
+        return this.noticeIdIncrement;
+    }
+
+    /**
+    * 设置 增加 公告id
+    * @param noticeIdIncrement
+    */
+    public void setNoticeIdIncrement(Long noticeIdIncrement){
+        this.noticeIdIncrement = noticeIdIncrement;
+    }
+
+    /**
+    * 获取 公告id
+    * @return noticeIdList
+    */
+    public List<Long> getNoticeIdList(){
+        return this.noticeIdList;
+    }
+
+    /**
+    * 设置 公告id
+    * @param noticeIdList
+    */
+    public void setNoticeIdList(List<Long> noticeIdList){
+        this.noticeIdList = noticeIdList;
+    }
+
+    /**
+    * 获取 公告id
+    * @return noticeIdNotList
+    */
+    public List<Long> getNoticeIdNotList(){
+        return this.noticeIdNotList;
+    }
+
+    /**
+    * 设置 公告id
+    * @param noticeIdNotList
+    */
+    public void setNoticeIdNotList(List<Long> noticeIdNotList){
+        this.noticeIdNotList = noticeIdNotList;
+    }
+
+
+    /**
+    * 获取 公告标题
+    * @return titleList
+    */
+    public List<String> getTitleList(){
+        return this.titleList;
+    }
+
+    /**
+    * 设置 公告标题
+    * @param titleList
+    */
+    public void setTitleList(List<String> titleList){
+        this.titleList = titleList;
+    }
+
+    /**
+    * 获取 公告标题
+    * @return titleNotList
+    */
+    public List<String> getTitleNotList(){
+        return this.titleNotList;
+    }
+
+    /**
+    * 设置 公告标题
+    * @param titleNotList
+    */
+    public void setTitleNotList(List<String> titleNotList){
+        this.titleNotList = titleNotList;
+    }
+
+    /**
+    * 获取 开始 房间id
+    * @return roomIdStart
+    */
+    public Long getRoomIdStart(){
+        return this.roomIdStart;
+    }
+
+    /**
+    * 设置 开始 房间id
+    * @param roomIdStart
+    */
+    public void setRoomIdStart(Long roomIdStart){
+        this.roomIdStart = roomIdStart;
+    }
+
+    /**
+    * 获取 结束 房间id
+    * @return $roomIdEnd
+    */
+    public Long getRoomIdEnd(){
+        return this.roomIdEnd;
+    }
+
+    /**
+    * 设置 结束 房间id
+    * @param roomIdEnd
+    */
+    public void setRoomIdEnd(Long roomIdEnd){
+        this.roomIdEnd = roomIdEnd;
+    }
+
+    /**
+    * 获取 增加 房间id
+    * @return roomIdIncrement
+    */
+    public Long getRoomIdIncrement(){
+        return this.roomIdIncrement;
+    }
+
+    /**
+    * 设置 增加 房间id
+    * @param roomIdIncrement
+    */
+    public void setRoomIdIncrement(Long roomIdIncrement){
+        this.roomIdIncrement = roomIdIncrement;
+    }
+
+    /**
+    * 获取 房间id
+    * @return roomIdList
+    */
+    public List<Long> getRoomIdList(){
+        return this.roomIdList;
+    }
+
+    /**
+    * 设置 房间id
+    * @param roomIdList
+    */
+    public void setRoomIdList(List<Long> roomIdList){
+        this.roomIdList = roomIdList;
+    }
+
+    /**
+    * 获取 房间id
+    * @return roomIdNotList
+    */
+    public List<Long> getRoomIdNotList(){
+        return this.roomIdNotList;
+    }
+
+    /**
+    * 设置 房间id
+    * @param roomIdNotList
+    */
+    public void setRoomIdNotList(List<Long> roomIdNotList){
+        this.roomIdNotList = roomIdNotList;
+    }
+
+
+    /**
+    * 获取 房间名称
+    * @return roomNameList
+    */
+    public List<String> getRoomNameList(){
+        return this.roomNameList;
+    }
+
+    /**
+    * 设置 房间名称
+    * @param roomNameList
+    */
+    public void setRoomNameList(List<String> roomNameList){
+        this.roomNameList = roomNameList;
+    }
+
+    /**
+    * 获取 房间名称
+    * @return roomNameNotList
+    */
+    public List<String> getRoomNameNotList(){
+        return this.roomNameNotList;
+    }
+
+    /**
+    * 设置 房间名称
+    * @param roomNameNotList
+    */
+    public void setRoomNameNotList(List<String> roomNameNotList){
+        this.roomNameNotList = roomNameNotList;
+    }
+
+    /**
+    * 获取 备注
+    * @return remarkList
+    */
+    public List<String> getRemarkList(){
+        return this.remarkList;
+    }
+
+    /**
+    * 设置 备注
+    * @param remarkList
+    */
+    public void setRemarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+    }
+
+    /**
+    * 获取 备注
+    * @return remarkNotList
+    */
+    public List<String> getRemarkNotList(){
+        return this.remarkNotList;
+    }
+
+    /**
+    * 设置 备注
+    * @param remarkNotList
+    */
+    public void setRemarkNotList(List<String> remarkNotList){
+        this.remarkNotList = remarkNotList;
+    }
+
+    /**
+    * 获取 开始 创建用户
+    * @return createUserIdStart
+    */
+    public Long getCreateUserIdStart(){
+        return this.createUserIdStart;
+    }
+
+    /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public void setCreateUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
+    }
+
+    /**
+    * 获取 结束 创建用户
+    * @return $createUserIdEnd
+    */
+    public Long getCreateUserIdEnd(){
+        return this.createUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public void setCreateUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 创建用户
+    * @return createUserIdIncrement
+    */
+    public Long getCreateUserIdIncrement(){
+        return this.createUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public void setCreateUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdList
+    */
+    public List<Long> getCreateUserIdList(){
+        return this.createUserIdList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public void setCreateUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdNotList
+    */
+    public List<Long> getCreateUserIdNotList(){
+        return this.createUserIdNotList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdNotList
+    */
+    public void setCreateUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+    }
+
+
+    /**
+    * 获取 开始 创建时间
+    * @return createTimeStart
+    */
+    public String getCreateTimeStart(){
+        return this.createTimeStart;
+    }
+
+    /**
+    * 设置 开始 创建时间
+    * @param createTimeStart
+    */
+    public void setCreateTimeStart(String createTimeStart){
+        this.createTimeStart = createTimeStart;
+    }
+
+    /**
+    * 获取 结束 创建时间
+    * @return createTimeEnd
+    */
+    public String getCreateTimeEnd(){
+        return this.createTimeEnd;
+    }
+
+    /**
+    * 设置 结束 创建时间
+    * @param createTimeEnd
+    */
+    public void setCreateTimeEnd(String createTimeEnd){
+        this.createTimeEnd = createTimeEnd;
+    }
+
+    /**
+    * 获取 开始 更新用户
+    * @return updateUserIdStart
+    */
+    public Long getUpdateUserIdStart(){
+        return this.updateUserIdStart;
+    }
+
+    /**
+    * 设置 开始 更新用户
+    * @param updateUserIdStart
+    */
+    public void setUpdateUserIdStart(Long updateUserIdStart){
+        this.updateUserIdStart = updateUserIdStart;
+    }
+
+    /**
+    * 获取 结束 更新用户
+    * @return $updateUserIdEnd
+    */
+    public Long getUpdateUserIdEnd(){
+        return this.updateUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 更新用户
+    * @param updateUserIdEnd
+    */
+    public void setUpdateUserIdEnd(Long updateUserIdEnd){
+        this.updateUserIdEnd = updateUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 更新用户
+    * @return updateUserIdIncrement
+    */
+    public Long getUpdateUserIdIncrement(){
+        return this.updateUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 更新用户
+    * @param updateUserIdIncrement
+    */
+    public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
+        this.updateUserIdIncrement = updateUserIdIncrement;
+    }
+
+    /**
+    * 获取 更新用户
+    * @return updateUserIdList
+    */
+    public List<Long> getUpdateUserIdList(){
+        return this.updateUserIdList;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdList
+    */
+    public void setUpdateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+    }
+
+    /**
+    * 获取 更新用户
+    * @return updateUserIdNotList
+    */
+    public List<Long> getUpdateUserIdNotList(){
+        return this.updateUserIdNotList;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdNotList
+    */
+    public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
+    }
+
+
+    /**
+    * 获取 开始 更新时间
+    * @return updateTimeStart
+    */
+    public String getUpdateTimeStart(){
+        return this.updateTimeStart;
+    }
+
+    /**
+    * 设置 开始 更新时间
+    * @param updateTimeStart
+    */
+    public void setUpdateTimeStart(String updateTimeStart){
+        this.updateTimeStart = updateTimeStart;
+    }
+
+    /**
+    * 获取 结束 更新时间
+    * @return updateTimeEnd
+    */
+    public String getUpdateTimeEnd(){
+        return this.updateTimeEnd;
+    }
+
+    /**
+    * 设置 结束 更新时间
+    * @param updateTimeEnd
+    */
+    public void setUpdateTimeEnd(String updateTimeEnd){
+        this.updateTimeEnd = updateTimeEnd;
+    }
+
+    /**
+    * 设置  主键ID，主键，自增长
+    * @param id
+    */
+    public NoticeRoomQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 主键ID，主键，自增长
+    * @param idStart
+    */
+    public NoticeRoomQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 主键ID，主键，自增长
+    * @param idEnd
+    */
+    public NoticeRoomQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 主键ID，主键，自增长
+    * @param idIncrement
+    */
+    public NoticeRoomQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 主键ID，主键，自增长
+    * @param idList
+    */
+    public NoticeRoomQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+        /**
+        * 设置 主键ID，主键，自增长
+        * @param idNotList
+        */
+        public NoticeRoomQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+        }
+
+    /**
+    * 设置  公告id
+    * @param noticeId
+    */
+    public NoticeRoomQuery noticeId(Long noticeId){
+	    setNoticeId(noticeId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 公告id
+    * @param noticeIdStart
+    */
+    public NoticeRoomQuery noticeIdStart(Long noticeIdStart){
+		this.noticeIdStart = noticeIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 公告id
+    * @param noticeIdEnd
+    */
+    public NoticeRoomQuery noticeIdEnd(Long noticeIdEnd){
+		this.noticeIdEnd = noticeIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 公告id
+    * @param noticeIdIncrement
+    */
+    public NoticeRoomQuery noticeIdIncrement(Long noticeIdIncrement){
+		this.noticeIdIncrement = noticeIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 公告id
+    * @param noticeIdList
+    */
+    public NoticeRoomQuery noticeIdList(List<Long> noticeIdList){
+        this.noticeIdList = noticeIdList;
+		return this;
+        }
+
+        /**
+        * 设置 公告id
+        * @param noticeIdNotList
+        */
+        public NoticeRoomQuery noticeIdNotList(List<Long> noticeIdNotList){
+        this.noticeIdNotList = noticeIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 公告标题
+    * @param title
+    */
+    public NoticeRoomQuery title(String title){
+        setTitle(title);
+		return this;
+    }
+
+    /**
+    * 设置 公告标题
+    * @param titleList
+    */
+    public NoticeRoomQuery titleList(List<String> titleList){
+        this.titleList = titleList;
+		return this;
+    }
+
+    /**
+    * 设置  房间id
+    * @param roomId
+    */
+    public NoticeRoomQuery roomId(Long roomId){
+	    setRoomId(roomId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 房间id
+    * @param roomIdStart
+    */
+    public NoticeRoomQuery roomIdStart(Long roomIdStart){
+		this.roomIdStart = roomIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 房间id
+    * @param roomIdEnd
+    */
+    public NoticeRoomQuery roomIdEnd(Long roomIdEnd){
+		this.roomIdEnd = roomIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 房间id
+    * @param roomIdIncrement
+    */
+    public NoticeRoomQuery roomIdIncrement(Long roomIdIncrement){
+		this.roomIdIncrement = roomIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 房间id
+    * @param roomIdList
+    */
+    public NoticeRoomQuery roomIdList(List<Long> roomIdList){
+        this.roomIdList = roomIdList;
+		return this;
+        }
+
+        /**
+        * 设置 房间id
+        * @param roomIdNotList
+        */
+        public NoticeRoomQuery roomIdNotList(List<Long> roomIdNotList){
+        this.roomIdNotList = roomIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 房间名称
+    * @param roomName
+    */
+    public NoticeRoomQuery roomName(String roomName){
+        setRoomName(roomName);
+		return this;
+    }
+
+    /**
+    * 设置 房间名称
+    * @param roomNameList
+    */
+    public NoticeRoomQuery roomNameList(List<String> roomNameList){
+        this.roomNameList = roomNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 备注
+    * @param remark
+    */
+    public NoticeRoomQuery remark(String remark){
+        setRemark(remark);
+		return this;
+    }
+
+    /**
+    * 设置 备注
+    * @param remarkList
+    */
+    public NoticeRoomQuery remarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+		return this;
+    }
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public NoticeRoomQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public NoticeRoomQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public NoticeRoomQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public NoticeRoomQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public NoticeRoomQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 创建用户
+        * @param createUserIdNotList
+        */
+        public NoticeRoomQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+        }
+
+
+    /**
+    * 设置  更新用户
+    * @param updateUserId
+    */
+    public NoticeRoomQuery updateUserId(Long updateUserId){
+	    setUpdateUserId(updateUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 更新用户
+    * @param updateUserIdStart
+    */
+    public NoticeRoomQuery updateUserIdStart(Long updateUserIdStart){
+		this.updateUserIdStart = updateUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 更新用户
+    * @param updateUserIdEnd
+    */
+    public NoticeRoomQuery updateUserIdEnd(Long updateUserIdEnd){
+		this.updateUserIdEnd = updateUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 更新用户
+    * @param updateUserIdIncrement
+    */
+    public NoticeRoomQuery updateUserIdIncrement(Long updateUserIdIncrement){
+		this.updateUserIdIncrement = updateUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdList
+    */
+    public NoticeRoomQuery updateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 更新用户
+        * @param updateUserIdNotList
+        */
+        public NoticeRoomQuery updateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
+        return this;
+        }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<NoticeRoomQuery> getOrConditionList(){
+    return this.orConditionList;
+    }
+
+    /**
+    * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @param orConditionList
+    */
+    public void setOrConditionList(List<NoticeRoomQuery> orConditionList){
+        this.orConditionList = orConditionList;
+    }
+
+    /**
+    * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @return andConditionList
+    */
+    public List<NoticeRoomQuery> getAndConditionList(){
+        return this.andConditionList;
+    }
+
+    /**
+    * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @param andConditionList
+    */
+    public void setAndConditionList(List<NoticeRoomQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/model/vo/NoticeRoomVo.java

+package com.mortals.xhx.module.notice.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.notice.model.NoticeRoomEntity;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
+/**
+* 房间公告视图对象
+*
+* @author zxfei
+* @date 2023-09-04
+*/
+@Data
+public class NoticeRoomVo extends BaseEntityLong {
+
+    /** 主键ID，主键，自增长列表 */
+    private List <Long> idList;
+
+
+}
\ No newline at end of file

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/model/vo/NoticeVo.java

+package com.mortals.xhx.module.notice.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.notice.model.NoticeEntity;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
+/**
+* 通知公告视图对象
+*
+* @author zxfei
+* @date 2023-09-04
+*/
+@Data
+public class NoticeVo extends BaseEntityLong {
+
+    /** 主键ID，主键，自增长列表 */
+    private List <Long> idList;
+
+
+}
\ No newline at end of file

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/service/NoticeRoomService.java

+package com.mortals.xhx.module.notice.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.notice.model.NoticeRoomEntity;
+import com.mortals.xhx.module.notice.dao.NoticeRoomDao;
+/**
+* NoticeRoomService
+*
+* 房间公告 service接口
+*
+* @author zxfei
+* @date 2023-09-04
+*/
+public interface NoticeRoomService extends ICRUDService<NoticeRoomEntity,Long>{
+
+    NoticeRoomDao getDao();
+}
\ No newline at end of file

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/service/NoticeService.java

+package com.mortals.xhx.module.notice.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.notice.model.NoticeEntity;
+import com.mortals.xhx.module.notice.dao.NoticeDao;
+/**
+* NoticeService
+*
+* 通知公告 service接口
+*
+* @author zxfei
+* @date 2023-09-04
+*/
+public interface NoticeService extends ICRUDService<NoticeEntity,Long>{
+
+    NoticeDao getDao();
+}
\ No newline at end of file

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/service/impl/NoticeRoomServiceImpl.java

+package com.mortals.xhx.module.notice.service.impl;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.notice.dao.NoticeRoomDao;
+import com.mortals.xhx.module.notice.model.NoticeRoomEntity;
+import com.mortals.xhx.module.notice.service.NoticeRoomService;
+import lombok.extern.slf4j.Slf4j;
+/**
+* NoticeRoomService
+* 房间公告 service实现
+*
+* @author zxfei
+* @date 2023-09-04
+*/
+@Service("noticeRoomService")
+@Slf4j
+public class NoticeRoomServiceImpl extends AbstractCRUDServiceImpl<NoticeRoomDao, NoticeRoomEntity, Long> implements NoticeRoomService {
+
+
+
+
+}
\ No newline at end of file

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/service/impl/NoticeServiceImpl.java

+package com.mortals.xhx.module.notice.service.impl;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.notice.dao.NoticeDao;
+import com.mortals.xhx.module.notice.model.NoticeEntity;
+import com.mortals.xhx.module.notice.service.NoticeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.mortals.xhx.module.notice.model.NoticeRoomEntity;
+import com.mortals.xhx.module.notice.model.NoticeRoomQuery;
+import com.mortals.xhx.module.notice.service.NoticeRoomService;
+import org.springframework.util.ObjectUtils;
+import java.util.Date;
+import java.util.Arrays;
+import java.util.List;
+import lombok.extern.slf4j.Slf4j;
+/**
+* NoticeService
+* 通知公告 service实现
+*
+* @author zxfei
+* @date 2023-09-04
+*/
+@Service("noticeService")
+@Slf4j
+public class NoticeServiceImpl extends AbstractCRUDServiceImpl<NoticeDao, NoticeEntity, Long> implements NoticeService {
+    @Autowired
+    private NoticeRoomService noticeRoomService;
+    
+    @Override
+    protected void saveAfter(NoticeEntity entity, Context context) throws AppException {
+        if(!ObjectUtils.isEmpty(entity.getNoticeRoomList())){
+            entity.getNoticeRoomList().stream().peek(item->{
+                item.setNoticeId(entity.getId());
+                item.setCreateUserId(this.getContextUserId(context));
+                item.setCreateTime(new Date());
+            }).count();
+            noticeRoomService.save(entity.getNoticeRoomList());
+        }
+        super.saveAfter(entity, context);
+    }
+
+    @Override
+    protected void updateAfter(NoticeEntity entity, Context context) throws AppException {
+        if(!ObjectUtils.isEmpty(entity.getNoticeRoomList())){
+            Long[] noticeRoomIds = noticeRoomService.find(new NoticeRoomQuery().noticeId(entity.getId())).stream().map(NoticeRoomEntity::getId).toArray(Long[]::new);
+            noticeRoomService.remove(noticeRoomIds,context);
+            entity.getNoticeRoomList().stream().peek(item ->{
+                item.setNoticeId(entity.getId());
+                item.setCreateUserId(this.getContextUserId(context));
+                item.setCreateTime(new Date());
+                item.setUpdateUserId(this.getContextUserId(context));
+                item.setUpdateTime(new Date());
+            }).count();
+            noticeRoomService.save(entity.getNoticeRoomList());
+        }
+        super.updateAfter(entity, context);
+    }
+
+    @Override
+    protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
+        List<NoticeRoomEntity> noticeRoomlist = noticeRoomService.find(new NoticeRoomQuery().noticeIdList(Arrays.asList(ids)));
+        noticeRoomService.removeList(noticeRoomlist,context);
+        super.removeAfter(ids, context, result);
+    }
+}
\ No newline at end of file

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/web/NoticeController.java

+package com.mortals.xhx.module.notice.web;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.notice.model.NoticeEntity;
+import com.mortals.xhx.module.notice.service.NoticeService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Arrays;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+/**
+*
+* 通知公告
+*
+* @author zxfei
+* @date 2023-09-04
+*/
+@RestController
+@RequestMapping("notice")
+public class NoticeController extends BaseCRUDJsonBodyMappingController<NoticeService,NoticeEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public NoticeController(){
+        super.setModuleDesc( "通知公告");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/web/NoticeRoomController.java

+package com.mortals.xhx.module.notice.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.notice.model.NoticeRoomEntity;
+import com.mortals.xhx.module.notice.service.NoticeRoomService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Arrays;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+/**
+*
+* 房间公告
+*
+* @author zxfei
+* @date 2023-09-04
+*/
+@RestController
+@RequestMapping("notice/room")
+public class NoticeRoomController extends BaseCRUDJsonBodyMappingController<NoticeRoomService,NoticeRoomEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public NoticeRoomController(){
+        super.setModuleDesc( "房间公告");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+    @Override
+    protected void saveBefore(NoticeRoomEntity entity, Map<String, Object> model, Context context) throws AppException {
+
+        //公告配置
+    }
+}
\ No newline at end of file

smart-office-manager/src/main/java/com/mortals/xhx/module/room/model/RoomEntity.java

@@ -2,6 +2,9 @@ package com.mortals.xhx.module.room.model;
 import java.util.List;
 import java.util.List;
 import java.util.ArrayList;
+import java.math.BigDecimal;
+import cn.hutool.core.date.DateUtil;
+import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
@@ -12,7 +15,7 @@ import lombok.Data;
  * 房间管理实体对象
  *
  * @author zxfei
- * @date 2023-05-29
+ * @date 2023-09-04
  */
 @Data
 public class RoomEntity extends RoomVo {
@@ -21,6 +24,7 @@ public class RoomEntity extends RoomVo {
     /**
      * 房间名称
      */
+    @Excel(name = "房间名称")
     private String roomName;
     /**
      * 房间编码
@@ -50,6 +54,16 @@ public class RoomEntity extends RoomVo {
      * 绑定的设备编码
      */
     private String deviceCode;
+    /**
+     * 文件名称
+     */
+    @Excel(name = "文件名称")
+    private String fileName;
+    /**
+     * 文件相对路径地址
+     */
+    @Excel(name = "文件相对路径地址")
+    private String filePath;
     /**
      * 房间设备信息信息
      */
@@ -78,21 +92,15 @@ public class RoomEntity extends RoomVo {
     }
 
     public void initAttrValue(){
-
         this.roomName = "";
-
         this.roomCode = "";
-
         this.roomType = 0;
-
-        this.deviceId = -1L;
-
+        this.deviceId = 0L;
         this.deviceName = "";
-
         this.countPerson = 0L;
-
         this.remark = "";
-
         this.deviceCode = "";
+        this.fileName = "";
+        this.filePath = "";
     }
 }
\ No newline at end of file

smart-office-manager/src/main/java/com/mortals/xhx/module/room/model/RoomQuery.java

@@ -7,7 +7,7 @@ import com.mortals.xhx.module.room.model.RoomEntity;
  * 房间管理查询对象
  *
  * @author zxfei
- * @date 2023-05-29
+ * @date 2023-09-04
  */
 public class RoomQuery extends RoomEntity {
     /** 开始 主键ID，主键，自增长 */
@@ -137,6 +137,16 @@ public class RoomQuery extends RoomEntity {
 
     /** 绑定的设备编码排除列表 */
     private List <String> deviceCodeNotList;
+    /** 文件名称 */
+    private List<String> fileNameList;
+
+    /** 文件名称排除列表 */
+    private List <String> fileNameNotList;
+    /** 文件相对路径地址 */
+    private List<String> filePathList;
+
+    /** 文件相对路径地址排除列表 */
+    private List <String> filePathNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<RoomQuery> orConditionList;
 
@@ -855,6 +865,70 @@ public class RoomQuery extends RoomEntity {
         this.deviceCodeNotList = deviceCodeNotList;
     }
 
+    /**
+     * 获取 文件名称
+     * @return fileNameList
+     */
+    public List<String> getFileNameList(){
+        return this.fileNameList;
+    }
+
+    /**
+     * 设置 文件名称
+     * @param fileNameList
+     */
+    public void setFileNameList(List<String> fileNameList){
+        this.fileNameList = fileNameList;
+    }
+
+    /**
+     * 获取 文件名称
+     * @return fileNameNotList
+     */
+    public List<String> getFileNameNotList(){
+        return this.fileNameNotList;
+    }
+
+    /**
+     * 设置 文件名称
+     * @param fileNameNotList
+     */
+    public void setFileNameNotList(List<String> fileNameNotList){
+        this.fileNameNotList = fileNameNotList;
+    }
+
+    /**
+     * 获取 文件相对路径地址
+     * @return filePathList
+     */
+    public List<String> getFilePathList(){
+        return this.filePathList;
+    }
+
+    /**
+     * 设置 文件相对路径地址
+     * @param filePathList
+     */
+    public void setFilePathList(List<String> filePathList){
+        this.filePathList = filePathList;
+    }
+
+    /**
+     * 获取 文件相对路径地址
+     * @return filePathNotList
+     */
+    public List<String> getFilePathNotList(){
+        return this.filePathNotList;
+    }
+
+    /**
+     * 设置 文件相对路径地址
+     * @param filePathNotList
+     */
+    public void setFilePathNotList(List<String> filePathNotList){
+        this.filePathNotList = filePathNotList;
+    }
+
     /**
      * 设置  主键ID，主键，自增长
      * @param id
@@ -1276,6 +1350,44 @@ public class RoomQuery extends RoomEntity {
         return this;
     }
 
+
+    /**
+     * 设置 文件名称
+     * @param fileName
+     */
+    public RoomQuery fileName(String fileName){
+        setFileName(fileName);
+        return this;
+    }
+
+    /**
+     * 设置 文件名称
+     * @param fileNameList
+     */
+    public RoomQuery fileNameList(List<String> fileNameList){
+        this.fileNameList = fileNameList;
+        return this;
+    }
+
+
+    /**
+     * 设置 文件相对路径地址
+     * @param filePath
+     */
+    public RoomQuery filePath(String filePath){
+        setFilePath(filePath);
+        return this;
+    }
+
+    /**
+     * 设置 文件相对路径地址
+     * @param filePathList
+     */
+    public RoomQuery filePathList(List<String> filePathList){
+        this.filePathList = filePathList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

smart-office-manager/src/main/java/com/mortals/xhx/module/room/model/vo/RoomVo.java

 package com.mortals.xhx.module.room.model.vo;
+
 import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.notice.model.NoticeEntity;
 import com.mortals.xhx.module.room.model.RoomEntity;
+
 import java.util.ArrayList;
 import java.util.List;
+
 import lombok.Data;
 import com.mortals.framework.annotation.Excel;
+
 import java.math.BigDecimal;
 import java.util.Date;
+
 /**
-* 房间管理视图对象
-*
-* @author zxfei
-* @date 2023-05-22
-*/
+ * 房间管理视图对象
+ *
+ * @author zxfei
+ * @date 2023-05-22
+ */
 @Data
 public class RoomVo extends BaseEntityLong {
 
@@ -26,7 +32,9 @@ public class RoomVo extends BaseEntityLong {
 
     private List<String> deviceCodeList;
 
-        private List <Long> idList;
+    private List<Long> idList;
+
+    private List<NoticeEntity> noticeList;
 
 
 }
\ No newline at end of file

smart-office-manager/src/main/java/com/mortals/xhx/module/room/service/impl/RoomServiceImpl.java

@@ -4,6 +4,12 @@ import com.mortals.framework.model.PageInfo;
 import com.mortals.xhx.module.device.model.DeviceEntity;
 import com.mortals.xhx.module.device.model.DeviceQuery;
 import com.mortals.xhx.module.device.service.DeviceService;
+import com.mortals.xhx.module.notice.model.NoticeEntity;
+import com.mortals.xhx.module.notice.model.NoticeQuery;
+import com.mortals.xhx.module.notice.model.NoticeRoomEntity;
+import com.mortals.xhx.module.notice.model.NoticeRoomQuery;
+import com.mortals.xhx.module.notice.service.NoticeRoomService;
+import com.mortals.xhx.module.notice.service.NoticeService;
 import com.mortals.xhx.module.workman.model.WorkmanQuery;
 import com.mortals.xhx.module.workman.service.WorkmanService;
 import org.springframework.stereotype.Service;
@@ -43,15 +49,27 @@ public class RoomServiceImpl extends AbstractCRUDServiceImpl<RoomDao, RoomEntity
     private DeviceService deviceService;
     @Autowired
     private WorkmanService workmanService;
+    @Autowired
+    private NoticeRoomService noticeRoomService;
+    @Autowired
+    private NoticeService noticeService;
+
 
 
     @Override
     protected void findAfter(RoomEntity params, PageInfo pageInfo, Context context, List<RoomEntity> list) throws AppException {
         super.findAfter(params, pageInfo, context, list);
-
         Map<Long, Long> collect = workmanService.find(new WorkmanQuery()).stream().collect(Collectors.groupingBy(x -> x.getRoomId(), Collectors.counting()));
-
         list.forEach(item->{
+            List<NoticeRoomEntity> noticeRoomEntities = noticeRoomService.find(new NoticeRoomQuery().roomId(item.getId()));
+            if(!ObjectUtils.isEmpty(noticeRoomEntities)){
+                NoticeQuery noticeQuery = new NoticeQuery();
+                noticeQuery.setIdList(noticeRoomEntities.stream().map(i->i.getId()).collect(Collectors.toList()));
+                List<NoticeEntity> noticeEntities = noticeService.find(noticeQuery, context);
+                if(!ObjectUtils.isEmpty(noticeEntities)){
+                    item.setNoticeList(noticeEntities);
+                }
+            }
             item.setCountPerson(collect.getOrDefault(item.getId(),item.getCountPerson()));
         });
     }

smart-office-manager/src/main/resources/sqlmap/module/notice/NoticeMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.notice.dao.ibatis.NoticeDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="NoticeEntity" id="NoticeEntity-Map">
+            <id  property="id" column="id" />
+            <result property="title" column="title" />
+            <result property="noticeContent" column="noticeContent" />
+            <result property="filePath" column="filePath" />
+            <result property="fileName" column="fileName" />
+            <result property="remark" column="remark" />
+            <result property="createUserId" column="createUserId" />
+            <result property="createTime" column="createTime" />
+            <result property="updateUserId" column="updateUserId" />
+            <result property="updateTime" column="updateTime" />
+            <collection property="noticeRoomList" column="id" ofType="NoticeRoomEntity" javaType="ArrayList" select="getNoticeRoomByNoticeId"></collection>
+    </resultMap>
+    <resultMap type="NoticeRoomEntity" id="NoticeRoomEntity-Map">
+            <result property="id" column="id" />
+            <result property="noticeId" column="noticeId" />
+            <result property="title" column="title" />
+            <result property="roomId" column="roomId" />
+            <result property="roomName" column="roomName" />
+            <result property="remark" column="remark" />
+            <result property="createUserId" column="createUserId" />
+            <result property="createTime" column="createTime" />
+            <result property="updateUserId" column="updateUserId" />
+            <result property="updateTime" column="updateTime" />
+    </resultMap>
+
+
+    <!-- 表所有列 -->
+    <sql id="_columns">
+        <trim suffixOverrides="," suffix="">
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+                    a.id,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('title') or colPickMode == 1 and data.containsKey('title')))">
+                    a.title,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('noticeContent') or colPickMode == 1 and data.containsKey('noticeContent')))">
+                    a.noticeContent,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePath') or colPickMode == 1 and data.containsKey('filePath')))">
+                    a.filePath,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileName') or colPickMode == 1 and data.containsKey('fileName')))">
+                    a.fileName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
+                    a.remark,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+                    a.createUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.createTime,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
+                    a.updateUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                    a.updateTime,
+                </if>
+        </trim>
+    </sql>
+    <!-- 子表所有列 -->
+    <sql id="_columns_sub">
+        <trim suffixOverrides="," suffix="">
+            b.id,b.noticeId,b.title,b.roomId,b.roomName,b.remark,b.createUserId,b.createTime,b.updateUserId,b.updateTime,
+        </trim>
+    </sql>
+    <!-- 新增 区分主键自增加还是业务插入 -->
+    <insert id="insert" parameterType="NoticeEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_xhx_notice
+        (title,noticeContent,filePath,fileName,remark,createUserId,createTime,updateUserId,updateTime)
+        VALUES
+        (#{title},#{noticeContent},#{filePath},#{fileName},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_xhx_notice
+        (title,noticeContent,filePath,fileName,remark,createUserId,createTime,updateUserId,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.title},#{item.noticeContent},#{item.filePath},#{item.fileName},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_xhx_notice as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('title')) or (colPickMode==1 and !data.containsKey('title'))">
+                a.title=#{data.title},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('noticeContent')) or (colPickMode==1 and !data.containsKey('noticeContent'))">
+                a.noticeContent=#{data.noticeContent},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('filePath')) or (colPickMode==1 and !data.containsKey('filePath'))">
+                a.filePath=#{data.filePath},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('fileName')) or (colPickMode==1 and !data.containsKey('fileName'))">
+                a.fileName=#{data.fileName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
+                a.remark=#{data.remark},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
+                a.createUserId=#{data.createUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
+                a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.createTime=#{data.createTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
+                a.updateUserId=#{data.updateUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
+                a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
+                a.updateTime=#{data.updateTime},
+            </if>
+        </trim>
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </update>
+    <!-- 批量更新 -->
+    <update id="updateBatch" parameterType="paramDto">
+        update mortals_xhx_notice as a
+        <trim prefix="set" suffixOverrides=",">
+                <trim prefix="title=(case" suffix="ELSE title end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('title')) or (colPickMode==1 and !item.containsKey('title'))">
+                            when a.id=#{item.id} then #{item.title}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="noticeContent=(case" suffix="ELSE noticeContent end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('noticeContent')) or (colPickMode==1 and !item.containsKey('noticeContent'))">
+                            when a.id=#{item.id} then #{item.noticeContent}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="filePath=(case" suffix="ELSE filePath end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('filePath')) or (colPickMode==1 and !item.containsKey('filePath'))">
+                            when a.id=#{item.id} then #{item.filePath}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="fileName=(case" suffix="ELSE fileName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('fileName')) or (colPickMode==1 and !item.containsKey('fileName'))">
+                            when a.id=#{item.id} then #{item.fileName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="remark=(case" suffix="ELSE remark end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
+                            when a.id=#{item.id} then #{item.remark}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+                                        when a.id=#{item.id} then #{item.createUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                            when a.id=#{item.id} then #{item.createTime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
+                                        when a.id=#{item.id} then #{item.updateUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+                            when a.id=#{item.id} then #{item.updateTime}
+                        </if>
+                    </foreach>
+                </trim>
+        </trim>
+        where id in
+        <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="NoticeEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_notice as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_xhx_notice as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_xhx_notice where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据主健列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeyList">
+        delete from mortals_xhx_notice where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <!-- 根据对象列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByEntityList">
+        delete from mortals_xhx_notice where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_xhx_notice as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="NoticeEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_notice as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+        <include refid="_orderCols_"/>
+    </select>
+    <!-- 获取子列表 -->
+    <select id="getNoticeRoomByNoticeId" parameterType="java.lang.Long" resultMap="NoticeRoomEntity-Map">
+        select <include refid="_columns_sub"/>
+        from mortals_xhx_notice_room as b
+        <trim suffixOverrides="where" suffix="">
+            where b.noticeId = #{id}
+        </trim>
+    </select>
+
+
+
+    <!-- 获取 -->
+    <select id="getListCount" parameterType="paramDto" resultType="int">
+        select count(1)
+        from mortals_xhx_notice as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </select>
+    <!-- 条件映射 -->
+    <sql id="_condition_">
+        <if test="condition != null and !condition.isEmpty()">
+            <!-- 条件映射-普通条件 -->
+            <include refid="_condition_param_">
+                <property name="_conditionParam_" value="condition"/>
+                <property name="_conditionType_" value="and"/>
+            </include>
+            <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
+            <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
+                and
+                <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
+                    <trim prefixOverrides="or" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="andCondition"/>
+                            <property name="_conditionType_" value="or"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+            <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
+            <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
+                and
+                <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
+                    <trim prefixOverrides="and" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="orCondition"/>
+                            <property name="_conditionType_" value="and"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+        </if>
+    </sql>
+    <!-- 条件映射-代参数 -->
+    <sql id="_condition_param_">
+        <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null">
+                ${_conditionType_} a.id=#{${_conditionParam_}.id}
+            </if>
+        </if>
+            <if test="conditionParamRef.containsKey('id')">
+                <if test="conditionParamRef.id != null ">
+                    ${_conditionType_} a.id = #{${_conditionParam_}.id}
+                </if>
+                <if test="conditionParamRef.id == null">
+                    ${_conditionType_} a.id is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
+                ${_conditionType_} a.id not in
+                <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+                ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+            </if>
+            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('title')">
+                <if test="conditionParamRef.title != null and conditionParamRef.title != ''">
+                    ${_conditionType_} a.title like #{${_conditionParam_}.title}
+                </if>
+                <if test="conditionParamRef.title == null">
+                    ${_conditionType_} a.title is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('titleList') and conditionParamRef.titleList.size() > 0">
+                ${_conditionType_} a.title in
+                <foreach collection="conditionParamRef.titleList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('titleNotList') and conditionParamRef.titleNotList.size() > 0">
+                ${_conditionType_} a.title not in
+                <foreach collection="conditionParamRef.titleNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('noticeContent')">
+                <if test="conditionParamRef.noticeContent != null and conditionParamRef.noticeContent != ''">
+                    ${_conditionType_} a.noticeContent like #{${_conditionParam_}.noticeContent}
+                </if>
+                <if test="conditionParamRef.noticeContent == null">
+                    ${_conditionType_} a.noticeContent is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('noticeContentList') and conditionParamRef.noticeContentList.size() > 0">
+                ${_conditionType_} a.noticeContent in
+                <foreach collection="conditionParamRef.noticeContentList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('noticeContentNotList') and conditionParamRef.noticeContentNotList.size() > 0">
+                ${_conditionType_} a.noticeContent not in
+                <foreach collection="conditionParamRef.noticeContentNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('filePath')">
+                <if test="conditionParamRef.filePath != null and conditionParamRef.filePath != ''">
+                    ${_conditionType_} a.filePath like #{${_conditionParam_}.filePath}
+                </if>
+                <if test="conditionParamRef.filePath == null">
+                    ${_conditionType_} a.filePath is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('filePathList') and conditionParamRef.filePathList.size() > 0">
+                ${_conditionType_} a.filePath in
+                <foreach collection="conditionParamRef.filePathList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('filePathNotList') and conditionParamRef.filePathNotList.size() > 0">
+                ${_conditionType_} a.filePath not in
+                <foreach collection="conditionParamRef.filePathNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('fileName')">
+                <if test="conditionParamRef.fileName != null and conditionParamRef.fileName != ''">
+                    ${_conditionType_} a.fileName like #{${_conditionParam_}.fileName}
+                </if>
+                <if test="conditionParamRef.fileName == null">
+                    ${_conditionType_} a.fileName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('fileNameList') and conditionParamRef.fileNameList.size() > 0">
+                ${_conditionType_} a.fileName in
+                <foreach collection="conditionParamRef.fileNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('fileNameNotList') and conditionParamRef.fileNameNotList.size() > 0">
+                ${_conditionType_} a.fileName not in
+                <foreach collection="conditionParamRef.fileNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('remark')">
+                <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
+                    ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
+                </if>
+                <if test="conditionParamRef.remark == null">
+                    ${_conditionType_} a.remark is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
+                ${_conditionType_} a.remark in
+                <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
+                ${_conditionType_} a.remark not in
+                <foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserId')">
+                <if test="conditionParamRef.createUserId != null ">
+                    ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
+                </if>
+                <if test="conditionParamRef.createUserId == null">
+                    ${_conditionType_} a.createUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                ${_conditionType_} a.createUserId in
+                <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
+                ${_conditionType_} a.createUserId not in
+                <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
+                ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('createTime')">
+                <if test="conditionParamRef.createTime != null ">
+                    ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+                </if>
+                <if test="conditionParamRef.createTime == null">
+                    ${_conditionType_} a.createTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+                ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+                ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserId')">
+                <if test="conditionParamRef.updateUserId != null ">
+                    ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
+                </if>
+                <if test="conditionParamRef.updateUserId == null">
+                    ${_conditionType_} a.updateUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+                ${_conditionType_} a.updateUserId in
+                <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
+                ${_conditionType_} a.updateUserId not in
+                <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('updateTime')">
+                <if test="conditionParamRef.updateTime != null ">
+                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
+                </if>
+                <if test="conditionParamRef.updateTime == null">
+                    ${_conditionType_} a.updateTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+    </sql>
+    <sql id="_orderCols_">
+        <if test="orderColList != null and !orderColList.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                     ${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                    <if test="orderCol.containsKey('id')">
+                        a.id
+                        <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('title')">
+                        a.title
+                        <if test='orderCol.title != null and "DESC".equalsIgnoreCase(orderCol.title)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('noticeContent')">
+                        a.noticeContent
+                        <if test='orderCol.noticeContent != null and "DESC".equalsIgnoreCase(orderCol.noticeContent)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('filePath')">
+                        a.filePath
+                        <if test='orderCol.filePath != null and "DESC".equalsIgnoreCase(orderCol.filePath)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('fileName')">
+                        a.fileName
+                        <if test='orderCol.fileName != null and "DESC".equalsIgnoreCase(orderCol.fileName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('remark')">
+                        a.remark
+                        <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createUserId')">
+                        a.createUserId
+                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createTime')">
+                        a.createTime
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateUserId')">
+                        a.updateUserId
+                        <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateTime')">
+                        a.updateTime
+                        <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                        ,
+                    </if>
+            </trim>
+        </if>
+    </sql>
+    <sql id="_group_by_">
+        <if test="groupList != null and !groupList.isEmpty()">
+            GROUP BY
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
+                    ${item}
+                </foreach>
+            </trim>
+        </if>
+    </sql>
+</mapper>
\ No newline at end of file

smart-office-manager/src/main/resources/sqlmap/module/notice/NoticeRoomMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.notice.dao.ibatis.NoticeRoomDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="NoticeRoomEntity" id="NoticeRoomEntity-Map">
+            <id  property="id" column="id" />
+            <result property="noticeId" column="noticeId" />
+            <result property="title" column="title" />
+            <result property="roomId" column="roomId" />
+            <result property="roomName" column="roomName" />
+            <result property="remark" column="remark" />
+            <result property="createUserId" column="createUserId" />
+            <result property="createTime" column="createTime" />
+            <result property="updateUserId" column="updateUserId" />
+            <result property="updateTime" column="updateTime" />
+            
+    </resultMap>
+
+
+    <!-- 表所有列 -->
+    <sql id="_columns">
+        <trim suffixOverrides="," suffix="">
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+                    a.id,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('noticeId') or colPickMode == 1 and data.containsKey('noticeId')))">
+                    a.noticeId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('title') or colPickMode == 1 and data.containsKey('title')))">
+                    a.title,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('roomId') or colPickMode == 1 and data.containsKey('roomId')))">
+                    a.roomId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('roomName') or colPickMode == 1 and data.containsKey('roomName')))">
+                    a.roomName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
+                    a.remark,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+                    a.createUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.createTime,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
+                    a.updateUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                    a.updateTime,
+                </if>
+        </trim>
+    </sql>
+    <!-- 新增 区分主键自增加还是业务插入 -->
+    <insert id="insert" parameterType="NoticeRoomEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_xhx_notice_room
+        (noticeId,title,roomId,roomName,remark,createUserId,createTime,updateUserId,updateTime)
+        VALUES
+        (#{noticeId},#{title},#{roomId},#{roomName},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_xhx_notice_room
+        (noticeId,title,roomId,roomName,remark,createUserId,createTime,updateUserId,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.noticeId},#{item.title},#{item.roomId},#{item.roomName},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_xhx_notice_room as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('noticeId')) or (colPickMode==1 and !data.containsKey('noticeId'))">
+                a.noticeId=#{data.noticeId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('noticeIdIncrement')) or (colPickMode==1 and !data.containsKey('noticeIdIncrement'))">
+                a.noticeId=ifnull(a.noticeId,0) + #{data.noticeIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('title')) or (colPickMode==1 and !data.containsKey('title'))">
+                a.title=#{data.title},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('roomId')) or (colPickMode==1 and !data.containsKey('roomId'))">
+                a.roomId=#{data.roomId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('roomIdIncrement')) or (colPickMode==1 and !data.containsKey('roomIdIncrement'))">
+                a.roomId=ifnull(a.roomId,0) + #{data.roomIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('roomName')) or (colPickMode==1 and !data.containsKey('roomName'))">
+                a.roomName=#{data.roomName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
+                a.remark=#{data.remark},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
+                a.createUserId=#{data.createUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
+                a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.createTime=#{data.createTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
+                a.updateUserId=#{data.updateUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
+                a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
+                a.updateTime=#{data.updateTime},
+            </if>
+        </trim>
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </update>
+    <!-- 批量更新 -->
+    <update id="updateBatch" parameterType="paramDto">
+        update mortals_xhx_notice_room as a
+        <trim prefix="set" suffixOverrides=",">
+                        <trim prefix="noticeId=(case" suffix="ELSE noticeId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('noticeId')) or (colPickMode==1 and !item.containsKey('noticeId'))">
+                                        when a.id=#{item.id} then #{item.noticeId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('noticeIdIncrement')) or (colPickMode==1 and !item.containsKey('noticeIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.noticeId,0) + #{item.noticeIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="title=(case" suffix="ELSE title end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('title')) or (colPickMode==1 and !item.containsKey('title'))">
+                            when a.id=#{item.id} then #{item.title}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="roomId=(case" suffix="ELSE roomId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('roomId')) or (colPickMode==1 and !item.containsKey('roomId'))">
+                                        when a.id=#{item.id} then #{item.roomId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('roomIdIncrement')) or (colPickMode==1 and !item.containsKey('roomIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.roomId,0) + #{item.roomIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="roomName=(case" suffix="ELSE roomName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('roomName')) or (colPickMode==1 and !item.containsKey('roomName'))">
+                            when a.id=#{item.id} then #{item.roomName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="remark=(case" suffix="ELSE remark end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
+                            when a.id=#{item.id} then #{item.remark}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+                                        when a.id=#{item.id} then #{item.createUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                            when a.id=#{item.id} then #{item.createTime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
+                                        when a.id=#{item.id} then #{item.updateUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+                            when a.id=#{item.id} then #{item.updateTime}
+                        </if>
+                    </foreach>
+                </trim>
+        </trim>
+        where id in
+        <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="NoticeRoomEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_notice_room as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_xhx_notice_room as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_xhx_notice_room where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据主健列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeyList">
+        delete from mortals_xhx_notice_room where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <!-- 根据对象列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByEntityList">
+        delete from mortals_xhx_notice_room where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_xhx_notice_room as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="NoticeRoomEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_notice_room as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+        <include refid="_orderCols_"/>
+    </select>
+
+
+
+    <!-- 获取 -->
+    <select id="getListCount" parameterType="paramDto" resultType="int">
+        select count(1)
+        from mortals_xhx_notice_room as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </select>
+    <!-- 条件映射 -->
+    <sql id="_condition_">
+        <if test="condition != null and !condition.isEmpty()">
+            <!-- 条件映射-普通条件 -->
+            <include refid="_condition_param_">
+                <property name="_conditionParam_" value="condition"/>
+                <property name="_conditionType_" value="and"/>
+            </include>
+            <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
+            <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
+                and
+                <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
+                    <trim prefixOverrides="or" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="andCondition"/>
+                            <property name="_conditionType_" value="or"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+            <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
+            <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
+                and
+                <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
+                    <trim prefixOverrides="and" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="orCondition"/>
+                            <property name="_conditionType_" value="and"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+        </if>
+    </sql>
+    <!-- 条件映射-代参数 -->
+    <sql id="_condition_param_">
+        <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null">
+                ${_conditionType_} a.id=#{${_conditionParam_}.id}
+            </if>
+        </if>
+            <if test="conditionParamRef.containsKey('id')">
+                <if test="conditionParamRef.id != null ">
+                    ${_conditionType_} a.id = #{${_conditionParam_}.id}
+                </if>
+                <if test="conditionParamRef.id == null">
+                    ${_conditionType_} a.id is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
+                ${_conditionType_} a.id not in
+                <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+                ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+            </if>
+            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('noticeId')">
+                <if test="conditionParamRef.noticeId != null ">
+                    ${_conditionType_} a.noticeId = #{${_conditionParam_}.noticeId}
+                </if>
+                <if test="conditionParamRef.noticeId == null">
+                    ${_conditionType_} a.noticeId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('noticeIdList') and conditionParamRef.noticeIdList.size() > 0">
+                ${_conditionType_} a.noticeId in
+                <foreach collection="conditionParamRef.noticeIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('noticeIdNotList') and conditionParamRef.noticeIdNotList.size() > 0">
+                ${_conditionType_} a.noticeId not in
+                <foreach collection="conditionParamRef.noticeIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('noticeIdStart') and conditionParamRef.noticeIdStart != null">
+                ${_conditionType_} a.noticeId <![CDATA[ >= ]]> #{${_conditionParam_}.noticeIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('noticeIdEnd') and conditionParamRef.noticeIdEnd != null">
+                ${_conditionType_} a.noticeId <![CDATA[ <= ]]> #{${_conditionParam_}.noticeIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('title')">
+                <if test="conditionParamRef.title != null and conditionParamRef.title != ''">
+                    ${_conditionType_} a.title like #{${_conditionParam_}.title}
+                </if>
+                <if test="conditionParamRef.title == null">
+                    ${_conditionType_} a.title is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('titleList') and conditionParamRef.titleList.size() > 0">
+                ${_conditionType_} a.title in
+                <foreach collection="conditionParamRef.titleList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('titleNotList') and conditionParamRef.titleNotList.size() > 0">
+                ${_conditionType_} a.title not in
+                <foreach collection="conditionParamRef.titleNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('roomId')">
+                <if test="conditionParamRef.roomId != null ">
+                    ${_conditionType_} a.roomId = #{${_conditionParam_}.roomId}
+                </if>
+                <if test="conditionParamRef.roomId == null">
+                    ${_conditionType_} a.roomId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('roomIdList') and conditionParamRef.roomIdList.size() > 0">
+                ${_conditionType_} a.roomId in
+                <foreach collection="conditionParamRef.roomIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('roomIdNotList') and conditionParamRef.roomIdNotList.size() > 0">
+                ${_conditionType_} a.roomId not in
+                <foreach collection="conditionParamRef.roomIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('roomIdStart') and conditionParamRef.roomIdStart != null">
+                ${_conditionType_} a.roomId <![CDATA[ >= ]]> #{${_conditionParam_}.roomIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('roomIdEnd') and conditionParamRef.roomIdEnd != null">
+                ${_conditionType_} a.roomId <![CDATA[ <= ]]> #{${_conditionParam_}.roomIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('roomName')">
+                <if test="conditionParamRef.roomName != null and conditionParamRef.roomName != ''">
+                    ${_conditionType_} a.roomName like #{${_conditionParam_}.roomName}
+                </if>
+                <if test="conditionParamRef.roomName == null">
+                    ${_conditionType_} a.roomName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('roomNameList') and conditionParamRef.roomNameList.size() > 0">
+                ${_conditionType_} a.roomName in
+                <foreach collection="conditionParamRef.roomNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('roomNameNotList') and conditionParamRef.roomNameNotList.size() > 0">
+                ${_conditionType_} a.roomName not in
+                <foreach collection="conditionParamRef.roomNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('remark')">
+                <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
+                    ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
+                </if>
+                <if test="conditionParamRef.remark == null">
+                    ${_conditionType_} a.remark is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
+                ${_conditionType_} a.remark in
+                <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
+                ${_conditionType_} a.remark not in
+                <foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserId')">
+                <if test="conditionParamRef.createUserId != null ">
+                    ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
+                </if>
+                <if test="conditionParamRef.createUserId == null">
+                    ${_conditionType_} a.createUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                ${_conditionType_} a.createUserId in
+                <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
+                ${_conditionType_} a.createUserId not in
+                <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
+                ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('createTime')">
+                <if test="conditionParamRef.createTime != null ">
+                    ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+                </if>
+                <if test="conditionParamRef.createTime == null">
+                    ${_conditionType_} a.createTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+                ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+                ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserId')">
+                <if test="conditionParamRef.updateUserId != null ">
+                    ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
+                </if>
+                <if test="conditionParamRef.updateUserId == null">
+                    ${_conditionType_} a.updateUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+                ${_conditionType_} a.updateUserId in
+                <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
+                ${_conditionType_} a.updateUserId not in
+                <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('updateTime')">
+                <if test="conditionParamRef.updateTime != null ">
+                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
+                </if>
+                <if test="conditionParamRef.updateTime == null">
+                    ${_conditionType_} a.updateTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+    </sql>
+    <sql id="_orderCols_">
+        <if test="orderColList != null and !orderColList.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                     ${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                    <if test="orderCol.containsKey('id')">
+                        a.id
+                        <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('noticeId')">
+                        a.noticeId
+                        <if test='orderCol.noticeId != null and "DESC".equalsIgnoreCase(orderCol.noticeId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('title')">
+                        a.title
+                        <if test='orderCol.title != null and "DESC".equalsIgnoreCase(orderCol.title)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('roomId')">
+                        a.roomId
+                        <if test='orderCol.roomId != null and "DESC".equalsIgnoreCase(orderCol.roomId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('roomName')">
+                        a.roomName
+                        <if test='orderCol.roomName != null and "DESC".equalsIgnoreCase(orderCol.roomName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('remark')">
+                        a.remark
+                        <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createUserId')">
+                        a.createUserId
+                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createTime')">
+                        a.createTime
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateUserId')">
+                        a.updateUserId
+                        <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateTime')">
+                        a.updateTime
+                        <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                        ,
+                    </if>
+            </trim>
+        </if>
+    </sql>
+    <sql id="_group_by_">
+        <if test="groupList != null and !groupList.isEmpty()">
+            GROUP BY
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
+                    ${item}
+                </foreach>
+            </trim>
+        </if>
+    </sql>
+</mapper>
\ No newline at end of file

smart-office-manager/src/main/resources/sqlmap/module/room/RoomMapper.xml

@@ -18,6 +18,8 @@
         <result property="updateUserId" column="updateUserId" />
         <result property="updateTime" column="updateTime" />
         <result property="deviceCode" column="deviceCode" />
+        <result property="fileName" column="fileName" />
+        <result property="filePath" column="filePath" />
         <collection property="roomDeviceList" column="id" ofType="RoomDeviceEntity" javaType="ArrayList" select="getRoomDeviceByRoomId"></collection>
     </resultMap>
     <resultMap type="RoomDeviceEntity" id="RoomDeviceEntity-Map">
@@ -77,6 +79,12 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceCode') or colPickMode == 1 and data.containsKey('deviceCode')))">
                 a.deviceCode,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileName') or colPickMode == 1 and data.containsKey('fileName')))">
+                a.fileName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePath') or colPickMode == 1 and data.containsKey('filePath')))">
+                a.filePath,
+            </if>
         </trim>
     </sql>
     <!-- 子表所有列 -->
@@ -88,18 +96,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="RoomEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_room
-        (roomName,roomCode,roomType,deviceId,deviceName,countPerson,remark,createUserId,createTime,updateUserId,updateTime,deviceCode)
+        (roomName,roomCode,roomType,deviceId,deviceName,countPerson,remark,createUserId,createTime,updateUserId,updateTime,deviceCode,fileName,filePath)
         VALUES
-        (#{roomName},#{roomCode},#{roomType},#{deviceId},#{deviceName},#{countPerson},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{deviceCode})
+        (#{roomName},#{roomCode},#{roomType},#{deviceId},#{deviceName},#{countPerson},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{deviceCode},#{fileName},#{filePath})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_room
-        (roomName,roomCode,roomType,deviceId,deviceName,countPerson,remark,createUserId,createTime,updateUserId,updateTime,deviceCode)
+        (roomName,roomCode,roomType,deviceId,deviceName,countPerson,remark,createUserId,createTime,updateUserId,updateTime,deviceCode,fileName,filePath)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.roomName},#{item.roomCode},#{item.roomType},#{item.deviceId},#{item.deviceName},#{item.countPerson},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.deviceCode})
+            (#{item.roomName},#{item.roomCode},#{item.roomType},#{item.deviceId},#{item.deviceName},#{item.countPerson},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.deviceCode},#{item.fileName},#{item.filePath})
         </foreach>
     </insert>
 
@@ -160,6 +168,12 @@
             <if test="(colPickMode==0 and data.containsKey('deviceCode')) or (colPickMode==1 and !data.containsKey('deviceCode'))">
                 a.deviceCode=#{data.deviceCode},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('fileName')) or (colPickMode==1 and !data.containsKey('fileName'))">
+                a.fileName=#{data.fileName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('filePath')) or (colPickMode==1 and !data.containsKey('filePath'))">
+                a.filePath=#{data.filePath},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -281,6 +295,20 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="fileName=(case" suffix="ELSE fileName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('fileName')) or (colPickMode==1 and !item.containsKey('fileName'))">
+                        when a.id=#{item.id} then #{item.fileName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="filePath=(case" suffix="ELSE filePath end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('filePath')) or (colPickMode==1 and !item.containsKey('filePath'))">
+                        when a.id=#{item.id} then #{item.filePath}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -702,6 +730,48 @@
                 #{item}
             </foreach>
         </if>
+
+        <if test="conditionParamRef.containsKey('fileName')">
+            <if test="conditionParamRef.fileName != null and conditionParamRef.fileName != ''">
+                ${_conditionType_} a.fileName like #{${_conditionParam_}.fileName}
+            </if>
+            <if test="conditionParamRef.fileName == null">
+                ${_conditionType_} a.fileName is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('fileNameList') and conditionParamRef.fileNameList.size() > 0">
+            ${_conditionType_} a.fileName in
+            <foreach collection="conditionParamRef.fileNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('fileNameNotList') and conditionParamRef.fileNameNotList.size() > 0">
+            ${_conditionType_} a.fileName not in
+            <foreach collection="conditionParamRef.fileNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('filePath')">
+            <if test="conditionParamRef.filePath != null and conditionParamRef.filePath != ''">
+                ${_conditionType_} a.filePath like #{${_conditionParam_}.filePath}
+            </if>
+            <if test="conditionParamRef.filePath == null">
+                ${_conditionType_} a.filePath is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('filePathList') and conditionParamRef.filePathList.size() > 0">
+            ${_conditionType_} a.filePath in
+            <foreach collection="conditionParamRef.filePathList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('filePathNotList') and conditionParamRef.filePathNotList.size() > 0">
+            ${_conditionType_} a.filePath not in
+            <foreach collection="conditionParamRef.filePathNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -780,6 +850,16 @@
                     <if test='orderCol.deviceCode != null and "DESC".equalsIgnoreCase(orderCol.deviceCode)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('fileName')">
+                    a.fileName
+                    <if test='orderCol.fileName != null and "DESC".equalsIgnoreCase(orderCol.fileName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('filePath')">
+                    a.filePath
+                    <if test='orderCol.filePath != null and "DESC".equalsIgnoreCase(orderCol.filePath)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>

smart-office-manager/src/test/java/com/mortals/httpclient/notice/NoticeController.http

+###登录
+POST {{baseUrl}}/login/login
+Content-Type: application/json
+
+{
+"loginName":"admin",
+"password":"admin",
+"securityCode":"8888"
+}
+
+> {%
+client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
+client.global.set("authToken", JSON.parse(response.body).data.token);
+%}
+
+###通知公告列表
+POST {{baseUrl}}/notice/list
+Content-Type: application/json
+
+{
+    "page":1,
+    "size":10
+}
+
+
+###通知公告更新与保存
+POST {{baseUrl}}/notice/save
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+        "title":"2fntwc",
+        "noticeContent":"47riae",
+        "filePath":"tcntq2",
+        "fileName":"rd8qfy",
+        "remark":"4b0igp",
+}
+
+> {%
+client.global.set("Notice_id", JSON.parse(response.body).data.id);
+%}
+
+###通知公告查看
+GET {{baseUrl}}/notice/info?id={{Notice_id}}
+Accept: application/json
+
+###通知公告编辑
+GET {{baseUrl}}/notice/edit?id={{Notice_id}}
+Accept: application/json
+
+
+###通知公告删除
+GET {{baseUrl}}/notice/delete?id={{Notice_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+
+

smart-office-manager/src/test/java/com/mortals/httpclient/notice/NoticeRoomController.http

+###登录
+POST {{baseUrl}}/login/login
+Content-Type: application/json
+
+{
+"loginName":"admin",
+"password":"admin",
+"securityCode":"8888"
+}
+
+> {%
+client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
+client.global.set("authToken", JSON.parse(response.body).data.token);
+%}
+
+###房间公告列表
+POST {{baseUrl}}/notice/room/list
+Content-Type: application/json
+
+{
+    "page":1,
+    "size":10
+}
+
+
+###房间公告更新与保存
+POST {{baseUrl}}/notice/room/save
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+        "noticeId":882,
+        "title":"lyrqsg",
+        "roomId":961,
+        "roomName":"w4a7jv",
+        "remark":"887xvv",
+}
+
+> {%
+client.global.set("NoticeRoom_id", JSON.parse(response.body).data.id);
+%}
+
+###房间公告查看
+GET {{baseUrl}}/notice/room/info?id={{NoticeRoom_id}}
+Accept: application/json
+
+###房间公告编辑
+GET {{baseUrl}}/notice/room/edit?id={{NoticeRoom_id}}
+Accept: application/json
+
+
+###房间公告删除
+GET {{baseUrl}}/notice/room/delete?id={{NoticeRoom_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+
+