添加大厅与窗口关联

base-manager/db/add.sql

@@ -46,3 +46,54 @@ ALTER TABLE mortals_sys_site_matter ADD COLUMN   `display` tinyint(2)    DEFAULT
 -- ----------------------------
 ALTER TABLE mortals_sys_site_theme_matter ADD COLUMN   `hot` tinyint(2)    DEFAULT '0'  COMMENT '热门(0.否,1.是)' AFTER userType;
 ALTER TABLE mortals_sys_site_theme_matter ADD COLUMN   `display` tinyint(2)    DEFAULT '1'  COMMENT '显示(0.否,1.是)' AFTER hot;
+
+
+-- ----------------------------
+2023-4-25
+-- ----------------------------
+-- ----------------------------
+-- 站点大厅信息表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_sys_site_hall`;
+CREATE TABLE mortals_sys_site_hall(
+    `id` bigint(20)   AUTO_INCREMENT   COMMENT '序号，主键，自增长',
+    `siteId` bigint(20)      COMMENT '站点ID',
+    `siteName` varchar(255)      COMMENT '站点名称',
+    `hallName` varchar(256)      COMMENT '大厅名称',
+    `address` varchar(256)      COMMENT '地址',
+    `floor` tinyint(2)    DEFAULT '1'  COMMENT '楼层',
+    `build` tinyint(2)    DEFAULT '1'  COMMENT '楼栋',
+    `remark` varchar(255)      COMMENT '备注',
+    `createTime` datetime      COMMENT '创建时间',
+    `createUserId` bigint(20)      COMMENT '创建用户',
+    `updateUserId` bigint(20)      COMMENT '更新用户',
+    `updateTime` datetime      COMMENT '修改时间',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='站点大厅信息';
+-- ----------------------------
+-- 大厅窗口表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_sys_window_hall`;
+CREATE TABLE mortals_sys_window_hall(
+    `id` bigint(20)   AUTO_INCREMENT   COMMENT '序号，主键，自增长',
+    `windowId` bigint(20)      COMMENT '窗口ID',
+    `windowName` varchar(255)      COMMENT '窗口名称',
+    `hallId` bigint(20)      COMMENT '大厅ID',
+    `hallName` varchar(255)      COMMENT '大厅名称',
+    `sort` int(4)    DEFAULT '0'  COMMENT '排序',
+    `remark` varchar(512)      COMMENT '备注',
+    `createTime` datetime      COMMENT '创建时间',
+    `createUserId` bigint(20)      COMMENT '创建用户',
+    `updateTime` datetime      COMMENT '修改时间',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='大厅窗口';
+
+
+INSERT INTO `mortals_xhx_resource` VALUES (null, '站点大厅信息-菜单管理-查看', '/site/hall/list,/site/hall/view,/site/hall/info,/site/hall/export,/site/hall/exportExcel,/site/hall/downloadTemplate,/site/hall/download', 3, 0, NULL, NULL, NULL, 0);
+INSERT INTO `mortals_xhx_resource` VALUES (null, '站点大厅信息-菜单管理-维护', '/site/hall/add,/site/hall/edit,/site/hall/delete,/site/hall/logicDelete,/site/hall/save,/site/hall/importData', 3, 0, NULL, NULL, NULL, 0);
+
+
+INSERT INTO `mortals_xhx_resource` VALUES (null, '大厅窗口-菜单管理-查看', '/window/hall/list,/window/hall/view,/window/hall/info,/window/hall/export,/window/hall/exportExcel,/window/hall/downloadTemplate,/window/hall/download', 3, 0, NULL, NULL, NULL, 0);
+INSERT INTO `mortals_xhx_resource` VALUES (null, '大厅窗口-菜单管理-维护', '/window/hall/add,/window/hall/edit,/window/hall/delete,/window/hall/logicDelete,/window/hall/save,/window/hall/importData', 3, 0, NULL, NULL, NULL, 0);
+
+

base-manager/doc/api.md

@@ -12280,6 +12280,451 @@ dict|object|字典对象
 }
 ```
 
+## 站点大厅信息
+
+### 查询站点大厅信息列表
+
+**请求URL:** site/hall/list
+
+**请求方式:** POST
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 查询站点大厅信息
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:------
+page|Integer|否|当前页
+size|Integer|否|每页条数，值为-1，查询所有记录
+
+**请求样例:**
+```
+  {
+        "page":1,
+        "size":10
+  }
+
+```
+**响应参数:**
+
+参数名称|参数类型|描述
+:---|:---|:------
+code|Integer|结果码（-1.失败，1.成功）
+msg|String|消息
+data|object|数据对象
+ per_page|Integer|每页条数
+ total|Integer|总条数
+ last_page|Integer|总页数
+ current_page|Integer|当前页
+ data|array|结果集列表|数组
+  id|Long|序号，主键，自增长
+  siteId|Long|站点ID
+  siteName|String|站点名称
+  hallName|String|大厅名称
+  address|String|地址
+  floor|Integer|楼层
+  build|Integer|楼栋
+  remark|String|备注
+  createTime|Date|创建时间
+  createUserId|Long|创建用户
+  updateUserId|Long|更新用户
+  updateTime|Date|修改时间
+dict|object|字典对象
+
+**响应消息样例:**
+```
+{
+    "code":1,
+    "data":{
+    }
+}
+```
+
+### 查看站点大厅信息
+
+**请求URL:** site/hall/info
+
+**请求方式:** GET
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 查看站点大厅信息，返回实例详细信息
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:------
+id|Long|是|ID
+
+**请求样例:**
+```
+    http://localhost/site/hall/info?id=549
+```
+**响应参数:**
+
+参数名称 |参数类型|描述
+:---|:---|:-------
+code|Integer|结果码（-1.失败，1.成功）
+msg|String|消息
+data|object|数据对象
+ id|Long|序号，主键，自增长
+ siteId|Long|站点ID
+ siteName|String|站点名称
+ hallName|String|大厅名称
+ address|String|地址
+ floor|Integer|楼层
+ build|Integer|楼栋
+ remark|String|备注
+ createTime|Date|创建时间
+ createUserId|Long|创建用户
+ updateUserId|Long|更新用户
+ updateTime|Date|修改时间
+dict|object|字典对象
+
+**响应消息样例:**
+```
+{
+    "code": 1,
+    "data": {
+            "id":9840,
+            "siteId":5054,
+            "siteName":"i5a751",
+            "hallName":"hoz3ni",
+            "address":"s6vhsd",
+            "floor":6966,
+            "build":7397,
+            "remark":"fjcm49",
+            "createTime":"2023-04-25",
+            "createUserId":9242,
+            "updateUserId":5587,
+            "updateTime":"2023-04-25"
+        }
+}
+```
+
+### 保存更新站点大厅信息
+
+**请求URL:** site/hall/save
+
+**请求方式:** POST
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 保存或更新站点大厅信息：id为空时为新增保存，否则为更新提交
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:-------
+siteId|Long|否|站点ID
+siteName|String|否|站点名称
+hallName|String|否|大厅名称
+address|String|否|地址
+floor|Integer|否|楼层
+build|Integer|否|楼栋
+remark|String|否|备注
+
+**请求样例:**
+```
+{
+    "siteId":4938,
+    "siteName":"8ivb5x",
+    "hallName":"fjm0wv",
+    "address":"fcnr01",
+    "floor":700,
+    "build":4881,
+    "remark":"x1qvxm",
+}
+
+```
+**响应参数:**
+
+参数名称 |参数类型|描述
+:---|:---|:------
+code|Integer|结果码（-1.失败，1.成功）
+msg|String|消息
+data|object|数据对象
+ id|Long|保存后主键id
+ entity|object|保存更新实体
+  id|Long|序号，主键，自增长
+  siteId|Long|站点ID
+  siteName|String|站点名称
+  hallName|String|大厅名称
+  address|String|地址
+  floor|Integer|楼层
+  build|Integer|楼栋
+  remark|String|备注
+  createTime|Date|创建时间
+  createUserId|Long|创建用户
+  updateUserId|Long|更新用户
+  updateTime|Date|修改时间
+
+**响应消息样例:**
+```
+{
+    "msg":"新增模块成功",
+    "code":1,
+    "data":{}
+    }
+}
+
+```
+
+### 删除站点大厅信息
+
+**请求URL:** site/hall/delete
+
+**请求方式:** GET
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 删除站点大厅信息
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:------
+id|String|是|数组
+
+**请求样例:**
+```
+    http://localhost:8080/site/hall/delete?id=1&id=2'
+```
+**响应参数:**
+
+参数名称 |参数类型|备注|其它
+---|---|---|---
+code|Integer|结果码（-1.失败，1.成功）|-
+msg|String|消息|-
+
+**响应消息样例:**
+```
+{
+    "code":1,
+	"msg":"成功"
+}
+
+```
+## 大厅窗口
+
+### 查询大厅窗口列表
+
+**请求URL:** window/hall/list
+
+**请求方式:** POST
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 查询大厅窗口
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:------
+page|Integer|否|当前页
+size|Integer|否|每页条数，值为-1，查询所有记录
+
+**请求样例:**
+```
+  {
+        "page":1,
+        "size":10
+  }
+
+```
+**响应参数:**
+
+参数名称|参数类型|描述
+:---|:---|:------
+code|Integer|结果码（-1.失败，1.成功）
+msg|String|消息
+data|object|数据对象
+ per_page|Integer|每页条数
+ total|Integer|总条数
+ last_page|Integer|总页数
+ current_page|Integer|当前页
+ data|array|结果集列表|数组
+  id|Long|序号，主键，自增长
+  windowId|Long|窗口ID
+  windowName|String|窗口名称
+  hallId|Long|大厅ID
+  hallName|String|大厅名称
+  sort|Integer|排序
+  remark|String|备注
+  createTime|Date|创建时间
+  createUserId|Long|创建用户
+  updateTime|Date|修改时间
+dict|object|字典对象
+
+**响应消息样例:**
+```
+{
+    "code":1,
+    "data":{
+    }
+}
+```
+
+### 查看大厅窗口
+
+**请求URL:** window/hall/info
+
+**请求方式:** GET
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 查看大厅窗口，返回实例详细信息
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:------
+id|Long|是|ID
+
+**请求样例:**
+```
+    http://localhost/window/hall/info?id=549
+```
+**响应参数:**
+
+参数名称 |参数类型|描述
+:---|:---|:-------
+code|Integer|结果码（-1.失败，1.成功）
+msg|String|消息
+data|object|数据对象
+ id|Long|序号，主键，自增长
+ windowId|Long|窗口ID
+ windowName|String|窗口名称
+ hallId|Long|大厅ID
+ hallName|String|大厅名称
+ sort|Integer|排序
+ remark|String|备注
+ createTime|Date|创建时间
+ createUserId|Long|创建用户
+ updateTime|Date|修改时间
+dict|object|字典对象
+
+**响应消息样例:**
+```
+{
+    "code": 1,
+    "data": {
+            "id":6104,
+            "windowId":6254,
+            "windowName":"1c5gt9",
+            "hallId":6706,
+            "hallName":"kneski",
+            "sort":6714,
+            "remark":"g8htor",
+            "createTime":"2023-04-25",
+            "createUserId":5190,
+            "updateTime":"2023-04-25"
+        }
+}
+```
+
+### 保存更新大厅窗口
+
+**请求URL:** window/hall/save
+
+**请求方式:** POST
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 保存或更新大厅窗口：id为空时为新增保存，否则为更新提交
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:-------
+windowId|Long|否|窗口ID
+windowName|String|否|窗口名称
+hallId|Long|否|大厅ID
+hallName|String|否|大厅名称
+sort|Integer|否|排序
+remark|String|否|备注
+
+**请求样例:**
+```
+{
+    "windowId":7283,
+    "windowName":"0n0oca",
+    "hallId":5929,
+    "hallName":"ukcvnf",
+    "sort":298,
+    "remark":"b9xvxa",
+}
+
+```
+**响应参数:**
+
+参数名称 |参数类型|描述
+:---|:---|:------
+code|Integer|结果码（-1.失败，1.成功）
+msg|String|消息
+data|object|数据对象
+ id|Long|保存后主键id
+ entity|object|保存更新实体
+  id|Long|序号，主键，自增长
+  windowId|Long|窗口ID
+  windowName|String|窗口名称
+  hallId|Long|大厅ID
+  hallName|String|大厅名称
+  sort|Integer|排序
+  remark|String|备注
+  createTime|Date|创建时间
+  createUserId|Long|创建用户
+  updateTime|Date|修改时间
+
+**响应消息样例:**
+```
+{
+    "msg":"新增模块成功",
+    "code":1,
+    "data":{}
+    }
+}
+
+```
+
+### 删除大厅窗口
+
+**请求URL:** window/hall/delete
+
+**请求方式:** GET
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 删除大厅窗口
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:------
+id|String|是|数组
+
+**请求样例:**
+```
+    http://localhost:8080/window/hall/delete?id=1&id=2'
+```
+**响应参数:**
+
+参数名称 |参数类型|备注|其它
+---|---|---|---
+code|Integer|结果码（-1.失败，1.成功）|-
+msg|String|消息|-
+
+**响应消息样例:**
+```
+{
+    "code":1,
+	"msg":"成功"
+}
+
+```
+
 
 ## 字典附录
 

base-manager/src/main/java/com/mortals/xhx/module/site/dao/SiteHallDao.java

+package com.mortals.xhx.module.site.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.site.model.SiteHallEntity;
+import java.util.List;
+/**
+* 站点大厅信息Dao
+* 站点大厅信息 DAO接口
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+
+public interface  SiteHallDao extends ICRUDDao<SiteHallEntity,Long>{
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/site/dao/ibatis/SiteHallDaoImpl.java

+package com.mortals.xhx.module.site.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.site.dao.SiteHallDao;
+import com.mortals.xhx.module.site.model.SiteHallEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 站点大厅信息DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+@Repository("siteHallDao")
+public class SiteHallDaoImpl extends BaseCRUDDaoMybatis<SiteHallEntity,Long> implements SiteHallDao {
+
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteHallEntity.java

+package com.mortals.xhx.module.site.model;
+import java.util.List;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.site.model.vo.SiteHallVo;
+import lombok.Data;
+/**
+* 站点大厅信息实体对象
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+@Data
+public class SiteHallEntity extends SiteHallVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 站点ID
+    */
+    private Long siteId;
+    /**
+    * 站点名称
+    */
+    private String siteName;
+    /**
+    * 大厅名称
+    */
+    private String hallName;
+    /**
+    * 地址
+    */
+    private String address;
+    /**
+    * 楼层
+    */
+    private Integer floor;
+    /**
+    * 楼栋
+    */
+    private Integer build;
+    /**
+    * 备注
+    */
+    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 SiteHallEntity) {
+            SiteHallEntity tmp = (SiteHallEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+
+            this.siteId = null;
+
+            this.siteName = "";
+
+            this.hallName = "";
+
+            this.address = "";
+
+            this.floor = 1;
+
+            this.build = 1;
+
+            this.remark = "";
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/site/model/vo/SiteHallVo.java

+package com.mortals.xhx.module.site.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.site.model.SiteHallEntity;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+/**
+* 站点大厅信息视图对象
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+@Data
+public class SiteHallVo extends BaseEntityLong {
+
+
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/site/service/SiteHallService.java

+package com.mortals.xhx.module.site.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.site.model.SiteHallEntity;
+import com.mortals.xhx.module.site.dao.SiteHallDao;
+/**
+* SiteHallService
+*
+* 站点大厅信息 service接口
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+public interface SiteHallService extends ICRUDService<SiteHallEntity,Long>{
+
+    SiteHallDao getDao();
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteHallServiceImpl.java

+package com.mortals.xhx.module.site.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.site.dao.SiteHallDao;
+import com.mortals.xhx.module.site.model.SiteHallEntity;
+import com.mortals.xhx.module.site.service.SiteHallService;
+/**
+* SiteHallService
+* 站点大厅信息 service实现
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+@Service("siteHallService")
+public class SiteHallServiceImpl extends AbstractCRUDServiceImpl<SiteHallDao, SiteHallEntity, Long> implements SiteHallService {
+    
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteHallController.java

+package com.mortals.xhx.module.site.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.site.model.SiteHallEntity;
+import com.mortals.xhx.module.site.service.SiteHallService;
+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-04-25
+*/
+@RestController
+@RequestMapping("site/hall")
+public class SiteHallController extends BaseCRUDJsonBodyMappingController<SiteHallService,SiteHallEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public SiteHallController(){
+        super.setModuleDesc( "站点大厅信息");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "floor", paramService.getParamBySecondOrganize("SiteHall","floor"));
+        this.addDict(model, "build", paramService.getParamBySecondOrganize("SiteHall","build"));
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/window/dao/WindowHallDao.java

+package com.mortals.xhx.module.window.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.window.model.WindowHallEntity;
+import java.util.List;
+/**
+* 大厅窗口Dao
+* 大厅窗口 DAO接口
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+
+public interface  WindowHallDao extends ICRUDDao<WindowHallEntity,Long>{
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/window/dao/ibatis/WindowHallDaoImpl.java

+package com.mortals.xhx.module.window.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.window.dao.WindowHallDao;
+import com.mortals.xhx.module.window.model.WindowHallEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 大厅窗口DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+@Repository("windowHallDao")
+public class WindowHallDaoImpl extends BaseCRUDDaoMybatis<WindowHallEntity,Long> implements WindowHallDao {
+
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/window/model/WindowHallEntity.java

+package com.mortals.xhx.module.window.model;
+import java.util.List;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.window.model.vo.WindowHallVo;
+import lombok.Data;
+/**
+* 大厅窗口实体对象
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+@Data
+public class WindowHallEntity extends WindowHallVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 窗口ID
+    */
+    private Long windowId;
+    /**
+    * 窗口名称
+    */
+    private String windowName;
+    /**
+    * 大厅ID
+    */
+    private Long hallId;
+    /**
+    * 大厅名称
+    */
+    private String hallName;
+    /**
+    * 排序
+    */
+    private Integer sort;
+    /**
+    * 备注
+    */
+    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 WindowHallEntity) {
+            WindowHallEntity tmp = (WindowHallEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+
+            this.windowId = null;
+
+            this.windowName = "";
+
+            this.hallId = null;
+
+            this.hallName = "";
+
+            this.sort = 0;
+
+            this.remark = "";
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/window/model/vo/WindowHallVo.java

+package com.mortals.xhx.module.window.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.window.model.WindowHallEntity;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+/**
+* 大厅窗口视图对象
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+@Data
+public class WindowHallVo extends BaseEntityLong {
+
+
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/window/service/WindowHallService.java

+package com.mortals.xhx.module.window.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.window.model.WindowHallEntity;
+import com.mortals.xhx.module.window.dao.WindowHallDao;
+/**
+* WindowHallService
+*
+* 大厅窗口 service接口
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+public interface WindowHallService extends ICRUDService<WindowHallEntity,Long>{
+
+    WindowHallDao getDao();
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowHallServiceImpl.java

+package com.mortals.xhx.module.window.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.window.dao.WindowHallDao;
+import com.mortals.xhx.module.window.model.WindowHallEntity;
+import com.mortals.xhx.module.window.service.WindowHallService;
+/**
+* WindowHallService
+* 大厅窗口 service实现
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+@Service("windowHallService")
+public class WindowHallServiceImpl extends AbstractCRUDServiceImpl<WindowHallDao, WindowHallEntity, Long> implements WindowHallService {
+    
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/window/web/WindowHallController.java

+package com.mortals.xhx.module.window.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.window.model.WindowHallEntity;
+import com.mortals.xhx.module.window.service.WindowHallService;
+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-04-25
+*/
+@RestController
+@RequestMapping("window/hall")
+public class WindowHallController extends BaseCRUDJsonBodyMappingController<WindowHallService,WindowHallEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public WindowHallController(){
+        super.setModuleDesc( "大厅窗口");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

base-manager/src/test/java/com/mortals/httpclient/site/SiteHallController.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}}/site/hall/list
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+    "page":1,
+    "size":10
+}
+
+
+###站点大厅信息更新与保存
+POST {{baseUrl}}/site/hall/save
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+        "siteId":759,
+        "siteName":"7r1bxj",
+        "hallName":"in9nu5",
+        "address":"48k2vz",
+        "floor":1,
+        "build":1,
+        "remark":"jzy16b",
+}
+
+> {%
+client.global.set("SiteHall_id", JSON.parse(response.body).data.id);
+%}
+
+###站点大厅信息查看
+GET {{baseUrl}}/site/hall/info?id={{SiteHall_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+###站点大厅信息编辑
+GET {{baseUrl}}/site/hall/edit?id={{SiteHall_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+###站点大厅信息删除
+GET {{baseUrl}}/site/hall/delete?id={{SiteHall_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+
+

base-manager/src/test/java/com/mortals/httpclient/window/WindowHallController.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}}/window/hall/list
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+    "page":1,
+    "size":10
+}
+
+
+###大厅窗口更新与保存
+POST {{baseUrl}}/window/hall/save
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+        "windowId":103,
+        "windowName":"0af77v",
+        "hallId":762,
+        "hallName":"nj1uyz",
+        "sort":0,
+        "remark":"f0ek6j",
+}
+
+> {%
+client.global.set("WindowHall_id", JSON.parse(response.body).data.id);
+%}
+
+###大厅窗口查看
+GET {{baseUrl}}/window/hall/info?id={{WindowHall_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+###大厅窗口编辑
+GET {{baseUrl}}/window/hall/edit?id={{WindowHall_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+###大厅窗口删除
+GET {{baseUrl}}/window/hall/delete?id={{WindowHall_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+
+