Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/db/add.sql

@@ -39,4 +39,66 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '应用主题	', 'App', 'appThemeN
 2023-4-12
 -- ----------------------------
 ALTER TABLE mortals_sys_site_matter ADD COLUMN   `hot` tinyint(2)    DEFAULT '0'  COMMENT '热门(0.否,1.是)' AFTER eventTypeShow;
-ALTER TABLE mortals_sys_site_matter ADD COLUMN   `display` tinyint(2)    DEFAULT '0'  COMMENT '显示(0.否,1.是)' AFTER hot;
+ALTER TABLE mortals_sys_site_matter ADD COLUMN   `display` tinyint(2)    DEFAULT '1'  COMMENT '显示(0.否,1.是)' AFTER hot;
+
+-- ----------------------------
+2023-4-23
+-- ----------------------------
+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);
+
+
+-- ----------------------------
+2023-5-04
+-- ----------------------------
+ALTER TABLE mortals_sys_window ADD COLUMN `nameDesc` varchar (256)  default "" COMMENT '名称描述' AFTER englishName;
+ALTER TABLE mortals_sys_window ADD COLUMN `englishNameDesc` varchar (256)  default "" COMMENT '英文名称描述' AFTER nameDesc;

base-manager/doc/api.md

@@ -6036,6 +6036,8 @@ data|object|数据对象|-
   createTime|Date|创建时间|-
   createUserId|Long|创建用户|-
   updateTime|Date|修改时间|-
+  nameDesc|String|名称描述
+  englishNameDesc|String|英文名称描述
 dict|object|字典对象|-
  hongqi|object|字典属性对象，详见附录|-
 
@@ -6106,6 +6108,8 @@ data|object|数据对象|-
  createTime|Date|创建时间|-
  createUserId|Long|创建用户|-
  updateTime|Date|修改时间|-
+ nameDesc|String|名称描述
+ englishNameDesc|String|英文名称描述
 dict|object|字典对象|-
  hongqi|object|字典属性对象，详见附录|-
 
@@ -6142,6 +6146,8 @@ hongqi|Integer|红旗窗口 (1.是，0.否)|是|-
 summary|String|备注|是|-
 building|Integer|楼栋|是|-
 level|Integer|楼层|是|-
+nameDesc|String|否|名称描述
+englishNameDesc|String|否|英文名称描述
 
 **请求样例:**
 
@@ -6262,6 +6268,85 @@ windowId|Long|窗口ID|是|窗口id
 
 ```
 
+
+### 查询大厅窗口列表
+
+**请求URL:** window/subHalllist
+
+**请求方式:** POST
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 查询当前站点所有没有在大厅配置的过的窗口
+
+**请求参数:**
+
+参数名称|类型|备注|必填|其它
+---|---|---|---|---
+page|Integer|当前页|否|-
+size|Integer|每页条数|否|-1全部
+siteId|Integer|每页条数|否|站点id
+
+**请求样例:**
+
+```
+
+  {
+        "page":1,
+        "size":10,
+         "siteId":1
+  }
+
+```
+
+**响应参数:**
+
+参数名称 |参数类型|备注|其它
+---|---|---|---
+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|站点名称|-
+  deptId|Long|部门ID|-
+  deptName|String|部门名称|-
+  name|String|窗口名称|-
+  englishName|String|英语窗口名|-
+  region|String|区域|-
+  englishRegion|String|英语区域|-
+  fromnum|String|窗口编号|-
+  hongqi|Integer|红旗窗口 (1.是，0.否)|-
+  summary|String|备注|-
+  building|Integer|楼栋|-
+  level|Integer|楼层|-
+  createTime|Date|创建时间|-
+  createUserId|Long|创建用户|-
+  updateTime|Date|修改时间|-
+dict|object|字典对象|-
+ hongqi|object|字典属性对象，详见附录|-
+
+**响应消息样例:**
+
+```
+{
+    "code":1,
+    "data":{
+        "per_page":10,
+        "total":0,
+        "data":[],
+        "last_page":0,
+        "current_page":1
+    },
+}
+```
+
+
 ## 工作人员
 
 ### 查询工作人员列表
@@ -12280,6 +12365,674 @@ 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/getBusinessByHall
+
+**请求方式:** POST
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 根据大厅查询所属业务列表
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:--|:---|:------
+id|Long|是|大厅Id
+
+**请求样例:**
+```
+  {
+        "id":1
+  }
+
+```
+**响应参数:**
+
+参数名称 |参数类型|备注|其它
+---|---|---|---
+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|站点名称|-
+  ancestors|String|祖级列表，逗号分隔|-
+  businessId|Long|业务ID|-
+  isBusiness|Integer|业务类型(0.一级业务,1.二级业务)|-
+  parentId|Long|业务父级ID|-
+  businessName|String|业务名称|-
+  status|Integer|业务状态 (0.停用，1.正常)|-
+  createTime|Date|创建时间|-
+  createUserId|Long|创建用户|-
+  updateTime|Date|修改时间|-
+dict|object|字典对象|-
+ isBusiness|object|字典属性对象，详见附录|-
+ status|object|字典属性对象，详见附录|-
+
+**响应消息样例:**
+
+```
+{
+    "code":1,
+    "data":{
+        "per_page":10,
+        "total":0,
+        "data":[],
+        "last_page":0,
+        "current_page":1
+    },
+    "query":{
+        "modelCode":"phxt1",
+        "modelName":"排号系统"
+    }
+}
+```
+
+
+### 查看站点大厅信息
+
+**请求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":"成功"
+}
+
+```
+
+## 设备告警日志
+
+### 查询设备告警日志列表
+
+**请求URL:** m/device/alarm/info/list
+
+**请求方式:** POST
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 查询设备告警日志
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:------
+page|Integer|否|当前页
+size|Integer|否|每页条数，值为-1，查询所有记录
+deviceName|String|否|设备名称，前后添加%%进行模糊搜索
+alarmType|Integer|否|告警类型(0.离线)
+alarmStatus|Integer|否|告警状态,来自工单系统(0.未清除，1.清除未确认，2.清除已确认)
+alarmTimeStart|String|否|告警开始时间
+alarmTimeEnd|String|否|告警结束时间
+siteId|Long|否|站点Id
+
+**请求样例:**
+```
+  {
+        "deviceName":"%测试%",
+        "alarmType":0,
+        "alarmStatus":0,
+        "siteId":1,
+        "page":1,
+        "size":10,
+        "alarmTimeStart":"2023-04-25",
+        "alarmTimeEnd":"2023-04-26",
+  }
+
+```
+**响应参数:**
+
+参数名称|参数类型|描述
+:---|:---|:------
+code|Integer|结果码（-1.失败，1.成功）
+msg|String|消息
+data|object|数据对象
+ per_page|Integer|每页条数
+ total|Integer|总条数
+ last_page|Integer|总页数
+ current_page|Integer|当前页
+ data|array|结果集列表|数组
+  id|Long|主键ID，主键，自增长
+  alarmTime|Date|告警时间
+  alarmDevice|Long|告警设备Id
+  alarmType|Integer|告警类型,(0.离线)
+  alarmLevel|Integer|告警级别(0.危险，1.次要，2.一般)
+  alarmReceivePersonnel|String|接收人员[设备管理的责任人]
+  receivePersonnelTelephone|String|接收人员电话
+  alarmStatus|Integer|告警状态,来自工单系统(0.未清除，1.清除未确认，2.清除已确认)
+  alarmContent|String|告警详细内容
+  createTime|Date|创建时间
+  updateUserId|Long|更新用户
+  updateTime|Date|更新时间
+  siteId|Long|站点Id，来源基础服务平台
+  deviceCode|String|设备编码
+  deviceName|String|设备名称
+dict|object|字典对象
+ alarmType|object|字典属性对象，详见附录
+ alarmLevel|object|字典属性对象，详见附录
+ alarmStatus|object|字典属性对象，详见附录
+
+**响应消息样例:**
+```
+{
+    "code":1,
+    "data":{
+    }
+}
+```
+
+### 查看设备告警日志
+
+**请求URL:** m/device/alarm/info/info
+
+**请求方式:** GET
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 查看设备告警日志，返回实例详细信息
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:------
+id|Long|是|ID
+
+**请求样例:**
+```
+    http://localhost/device/alarm/info/info?id=549
+```
+**响应参数:**
+
+参数名称 |参数类型|描述
+:---|:---|:-------
+code|Integer|结果码（-1.失败，1.成功）
+msg|String|消息
+data|object|数据对象
+ id|Long|主键ID，主键，自增长
+ alarmTime|Date|告警时间
+ alarmDevice|Long|告警设备Id
+ alarmType|Integer|告警类型,(0.离线)
+ alarmLevel|Integer|告警级别(0.危险，1.次要，2.一般)
+ alarmReceivePersonnel|String|接收人员[设备管理的责任人]
+ receivePersonnelTelephone|String|接收人员电话
+ alarmStatus|Integer|告警状态,来自工单系统(0.未清除，1.清除未确认，2.清除已确认)
+ alarmContent|String|告警详细内容
+ createTime|Date|创建时间
+ updateUserId|Long|更新用户
+ updateTime|Date|更新时间
+ siteId|Long|站点Id，来源基础服务平台
+ deviceCode|String|设备编码
+ deviceName|String|设备名称
+dict|object|字典对象
+ alarmType|object|字典属性对象，详见附录
+ alarmLevel|object|字典属性对象，详见附录
+ alarmStatus|object|字典属性对象，详见附录
+
+**响应消息样例:**
+```
+{
+    "code": 1,
+    "data": {
+            "id":1196,
+            "alarmTime":"2023-04-27",
+            "alarmDevice":779,
+            "alarmType":2479,
+            "alarmLevel":3913,
+            "alarmReceivePersonnel":"5qpgct",
+            "receivePersonnelTelephone":"bi9uwy",
+            "alarmStatus":5144,
+            "alarmContent":"ncrl5t",
+            "createTime":"2023-04-27",
+            "updateUserId":4280,
+            "updateTime":"2023-04-27",
+            "siteId":4085,
+            "deviceCode":"snkbdp",
+            "deviceName":"yoerxw"
+        }
+}
+```
 
 ## 字典附录
 

base-manager/pom.xml

@@ -36,9 +36,10 @@
                 <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
                 <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
                 <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
-                <profiles.log.level>INFO</profiles.log.level>
+                <profiles.log.level>debug</profiles.log.level>
                 <package.environment>test</package.environment>
                 <skipUi>false</skipUi>
+                <showSql>false</showSql>
             </properties>
         </profile>
         <profile>

base-manager/src/main/java/com/mortals/xhx/base/framework/filter/LogFilter.java

+package com.mortals.xhx.base.framework.filter;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.filter.Filter;
+import ch.qos.logback.core.spi.FilterReply;
+import lombok.extern.slf4j.Slf4j;
+
+
+public class LogFilter extends Filter<ILoggingEvent> {
+
+    @Override
+    public FilterReply decide(ILoggingEvent event) {
+        if (event.getLoggerName().contains("TaskDaoImpl.getList")) {
+            return FilterReply.DENY;
+        }
+        if(event.getMessage().contains("from mortals_xhx_task as a")){
+            return FilterReply.DENY;
+        }
+        return FilterReply.NEUTRAL;
+    }
+}

base-manager/src/main/java/com/mortals/xhx/base/system/resource/dao/ResourceDao.java

 /**
-* 文件：ResourceDao.java
-* 版本：1.0.0
-* 日期：
-* Copyright ® 
-* All right reserved.
-*/
+ * 文件：ResourceDao.java
+ * 版本：1.0.0
+ * 日期：
+ * Copyright ®
+ * All right reserved.
+ */
 
 package com.mortals.xhx.base.system.resource.dao;
 
 
 import com.mortals.framework.dao.ICRUDDao;
 import com.mortals.xhx.base.system.resource.model.ResourceEntity;
+import com.mortals.xhx.module.matter.model.MatterEntity;
 
 import java.util.List;
 
@@ -23,8 +24,9 @@ import java.util.List;
  * @version 1.0.0
  */
 
-public interface ResourceDao extends ICRUDDao<ResourceEntity,Long> {
-    public List<ResourceEntity> getListByUserId(Long userId);
+public interface ResourceDao extends ICRUDDao<ResourceEntity, Long> {
+    List<ResourceEntity> getListByUserId(Long userId);
 
     List<ResourceEntity> getAll(int userType);
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/common/utils/MatterDetailHtmlParseUtil.java

@@ -9,6 +9,7 @@ import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
+import org.springframework.util.ObjectUtils;
 
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathFactory;
@@ -286,13 +287,37 @@ public class MatterDetailHtmlParseUtil {
     public static Map<String, String> getSfbzMapByHtml(Document dom) {
         Map<String, String> resultMap = new HashMap<>();
         String baseInfoExp = "//div[@class='section8']//p";
+        String baseInfoExp1 = "//div[@class='section8']/p";
+        String baseInfoExp2 = "//*[@class='section8']//div[@class='money cf']//p";
         try {
-            Elements elements = dom.selectXpath(baseInfoExp);
             StringBuilder sb = new StringBuilder();
+            Elements elements = dom.selectXpath(baseInfoExp1);
+            if (ObjectUtils.isEmpty(elements)) {
+                Elements elements2 = dom.selectXpath(baseInfoExp2);
+                for (int i = 0; i < elements2.size(); i++) {
+                    // System.out.println(elements2.get(i).text().trim());
+                    sb.append(elements2.get(i).text().trim());
+                    sb.append(":");
+                    Elements elements3 = dom.selectXpath(String.format("//*[@class='section8']/div[2]/div[4]/p[%s]", i + 1));
+                    ////*[@class="section8"]/div[2]/div[4]/p[1]
+                    for (int j = 0; j < elements3.size(); j++) {
+                        //  System.out.println(elements3.get(j).text().trim());
+                        sb.append(elements3.get(j).text().trim());
+                    }
+                    sb.append("</br>");
+                }
+            } else {
+                sb.append("该事项无收费标准！");
+/*                Elements elements4 = dom.selectXpath(baseInfoExp);
+                for (int i = 0; i < elements4.size(); i++) {
+                }*/
+            }
+
+/*            StringBuilder sb = new StringBuilder();
             for (int i = 0; i < elements.size(); i++) {
                 sb.append(elements.get(i).text());
-            }
-            resultMap.put("sfbz", sb.toString());
+            }*/
+            // resultMap.put("sfbz", sb.toString());
            /* result = xPath.evaluate(baseInfoExp, dom, XPathConstants.NODESET);
             if (result instanceof NodeList) {
                 NodeList nodeList = (NodeList) result;
@@ -302,6 +327,8 @@ public class MatterDetailHtmlParseUtil {
                 }
                 resultMap.put("sfbz", sb.toString());
             }*/
+
+            resultMap.put("sfbz", sb.toString());
         } catch (Exception e) {
             log.error("收费标准xpath解析异常:", e);
         }
@@ -440,7 +467,8 @@ public class MatterDetailHtmlParseUtil {
         //String url = "http://www.sczwfw.gov.cn/jiq/front/transition/ywTransToDetail?areaCode=511102000000&itemCode=511A0099100005-511102000000-000-11511002735871990X-1-00&taskType=1&deptCode=11511002735871990X";
         //String url = "http://www.sczwfw.gov.cn/jiq/front/transition/ywTransToDetail?areaCode=513426000000&itemCode=511F3000300009-513426000000-000-11513426MB1541028A-1-00&taskType=7&deptCode=009075316";
 
-        String url = "http://www.sczwfw.gov.cn/jiq/front/transition/ywTransToDetail?areaCode=511500000000&itemCode=511A0152600000-511500000000-000-511501-7-1-00&taskType=1&deptCode=511501-7";
+        // String url = "http://www.sczwfw.gov.cn/jiq/front/transition/ywTransToDetail?areaCode=511500000000&itemCode=511A0151400000-511500000000-000-511501-7-1-00&taskType=1&deptCode=511501-7";
+        String url = "http://www.sczwfw.gov.cn/jiq/front/transition/ywTransToDetail?areaCode=511500000000&itemCode=511A0000400004-511500000000-000-1151120000870212XU-1-00&taskType=1&deptCode=3922757070285361152";
 
         Document dom = MatterDetailHtmlParseUtil.getDomByHtml(url);
         Map<String, String> baseInfoMap = MatterDetailHtmlParseUtil.getbaseInfoMapByHtml(dom);

base-manager/src/main/java/com/mortals/xhx/common/utils/MemoryPagination.java

+package com.mortals.xhx.common.utils;
+
+import com.alibaba.fastjson.JSON;
+import org.apache.commons.collections4.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.LongStream;
+
+/**
+ * @author: zxfei
+ * @date: 2022/6/28 14:38
+ * @description: 内存分页
+ **/
+public class MemoryPagination {
+    /**
+     * 内存分页
+     *
+     * @param records  待分页的数据
+     * @param pageNum  当前页码
+     * @param pageSize 每页显示的条数
+     * @return 分页之后的数据
+     */
+    public static <T> List<T> pagination(List<T> records, int pageNum, int pageSize) {
+        if (CollectionUtils.isEmpty(records)) {
+            return Collections.emptyList();
+        }
+        int totalCount = records.size();
+        if(pageSize==-1){
+            pageSize=totalCount;
+        }
+        int remainder = totalCount % pageSize;
+        int pageCount = (remainder > 0) ? totalCount / pageSize + 1 : totalCount / pageSize;
+        if (remainder == 0) {
+            return records.stream().skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+        } else {
+            if (pageNum == pageCount) {
+                return records.stream().skip((pageNum - 1) * pageSize).limit(totalCount).collect(Collectors.toList());
+            } else {
+                return records.stream().skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+            }
+        }
+    }
+
+
+/*    public static List<SitestatEntity> search(String name, List<SitestatEntity> list){
+        List<SitestatEntity> results = new ArrayList();
+        Pattern pattern = Pattern.compile(name,Pattern.CASE_INSENSITIVE);
+        for(int i=0; i < list.size(); i++){
+            Matcher matcher = pattern.matcher((list.get(i)).getSiteName());
+            if(matcher.find()){
+                results.add(list.get(i));
+            }
+        }
+        return results;
+    }*/
+
+    public static <T> Predicate<T> distinctByKey(Function<? super T, ?> keyExtractor) {
+        Set<Object> seen = ConcurrentHashMap.newKeySet();
+        return t -> seen.add(keyExtractor.apply(t));
+    }
+
+
+    public static void main(String[] args) {
+        ArrayList<Integer> integers = new ArrayList<>();
+        for(int i=0;i<10;i++){
+            integers.add(i);
+        }
+
+        List<Integer> pagination = MemoryPagination.pagination(integers, 1, 10);
+
+        System.out.println(JSON.toJSONString(pagination));
+
+
+    }
+}

base-manager/src/main/java/com/mortals/xhx/common/utils/SyncGovMatterDetailThread.java

@@ -18,6 +18,7 @@ import com.mortals.xhx.module.matter.model.MatterQuery;
 import com.mortals.xhx.module.matter.service.MatterService;
 import com.mortals.xhx.module.site.model.SiteEntity;
 import com.mortals.xhx.module.site.model.SiteMatterEntity;
+import com.mortals.xhx.module.site.model.SiteMatterQuery;
 import com.mortals.xhx.module.site.model.SiteQuery;
 import com.mortals.xhx.module.site.service.SiteMatterService;
 import com.mortals.xhx.module.site.service.SiteService;
@@ -97,6 +98,11 @@ public class SyncGovMatterDetailThread implements Runnable {
             if (!ObjectUtils.isEmpty(siteEntities)) {
                 log.info("同步站点事项到站点.....");
                 for (SiteEntity site : siteEntities) {
+                    //判断是否已经有站点事项，如果有则不添加
+                    int count = siteMatterService.count(new SiteMatterQuery().siteId(site.getId()), null);
+                    if (count > 0) {
+                        continue;
+                    }
                     List<SiteMatterEntity> siteMatterList = matterEntityList.stream().map(item -> {
                         return matterService.switchMatterToSiteMatter(item, site, context).getData();
                     }).filter(f -> f != null).collect(Collectors.toList());

base-manager/src/main/java/com/mortals/xhx/daemon/task/StatSiteDeptMatterTaskImpl.java

@@ -3,6 +3,7 @@ package com.mortals.xhx.daemon.task;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.ITask;
 import com.mortals.framework.service.ITaskExcuteService;
+import com.mortals.xhx.common.code.SourceEnum;
 import com.mortals.xhx.module.dept.model.DeptEntity;
 import com.mortals.xhx.module.dept.model.DeptQuery;
 import com.mortals.xhx.module.dept.service.DeptService;
@@ -37,7 +38,7 @@ public class StatSiteDeptMatterTaskImpl implements ITaskExcuteService {
         log.info("开始同步事项列表！");
         List<DeptEntity> deptEntities = deptService.find(new DeptQuery());
         for (DeptEntity deptEntity : deptEntities) {
-            int total = matterService.count(new MatterQuery().deptCode(deptEntity.getDeptNumber()), null);
+            int total = matterService.count(new MatterQuery().source(SourceEnum.政务网.getValue()).deptCode(deptEntity.getDeptNumber()), null);
             if (total > 0) {
                 DeptEntity deptQuery = new DeptEntity();
                 deptQuery.setTotal(total);
@@ -46,7 +47,6 @@ public class StatSiteDeptMatterTaskImpl implements ITaskExcuteService {
                 condition.setId(deptEntity.getId());
                 deptService.getDao().update(deptQuery, condition);
 
-                // deptService.update(deptEntity, null);
             }
 
         }

base-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java

@@ -19,6 +19,7 @@ import com.mortals.xhx.module.dept.service.DeptService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
@@ -28,7 +29,8 @@ import java.util.List;
  * 同步用户
  */
 @Slf4j
-//@Service("SyncUserTask")
+@Service("SyncUserTask")
+@ConditionalOnExpression("'${spring.profiles.active}'!='develop'")
 public class SyncUserTaskImpl implements ITaskExcuteService {
 
     @Autowired

base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppServiceImpl.java

@@ -3,10 +3,12 @@ package com.mortals.xhx.module.app.service.impl;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.net.url.UrlBuilder;
 import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ReUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ZipUtil;
 import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Lists;
+import com.google.common.net.InternetDomainName;
 import com.mortals.framework.model.DbMatchMode;
 import com.google.common.collect.Maps;
 
@@ -114,37 +116,48 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
             // String domainUrl = GlobalSysInfo.getParamValue(Constant.PARAM_SERVER_HTTP_URL, "http://192.168.0.98:11078");
             String domainUrl = "";
             if (!ObjectUtils.isEmpty(params.getServerName()) && Validator.isIpv4(params.getServerName())) {
-                domainUrl = UrlBuilder.ofHttp(params.getServerName()).setPort(params.getServerPort() > 0 ? params.getServerPort() : 11078).build();
-                domainUrl = StrUtil.sub(domainUrl, 0, domainUrl.length() - 1);
+                //domainUrl = UrlBuilder.ofHttp(params.getServerName()).setPort(params.getServerPort() > 0 ? params.getServerPort() : 11078).build();
+                //domainUrl = StrUtil.sub(domainUrl, 0, domainUrl.length() - 1);
 
-            }else {
+                domainUrl= String.format("http://%s:%d",params.getServerName(), params.getServerPort() > 0 ? params.getServerPort() : 11078);
+            } else {
                 // domainUrl = GlobalSysInfo.getParamValue(Constant.PARAM_SERVER_HTTP_URL, "http://192.168.0.98:11078");
 
-                domainUrl="";
+                boolean isDomain = ReUtil.isMatch("^[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})*\\.[a-zA-Z]{2,}$", params.getServerName());
+                if (isDomain) {
+                    domainUrl = String.format("https://%s", params.getServerName());
+                } else {
+                    domainUrl = "";
+                }
+
             }
 
             if (!ObjectUtils.isEmpty(siteEntity)) {
                 //请求地址 http://domian/app/siteCode/appcode/html
-
-                if(!ObjectUtils.isEmpty(domainUrl)){
-                    item.setCustUrl(UrlBuilder.ofHttp(domainUrl)
-                            .addPath(CUSTAPP_ROOT_PATH)
-                            .addPath(siteEntity.getSiteCode())
-                            .addPath(item.getAppCode())
-                            .addPath(item.getVersion().toString())
-                            .build());
-                }else{
-                    item.setCustUrl(CUSTAPP_ROOT_PATH+"/"+siteEntity.getSiteCode()+"/"+item.getAppCode()+"/"+item.getVersion());
+                if (!ObjectUtils.isEmpty(domainUrl)) {
+                    String custUrl = String.format("%s/%s/%s/%s/%s/", domainUrl, CUSTAPP_ROOT_PATH, siteEntity.getSiteCode(), item.getAppCode(), item.getVersion().toString());
+                    item.setCustUrl(custUrl);
+//                    item.setCustUrl(UrlBuilder.ofHttp(domainUrl)
+//                            .addPath(CUSTAPP_ROOT_PATH)
+//                            .addPath(siteEntity.getSiteCode())
+//                            .addPath(item.getAppCode())
+//                            .addPath(item.getVersion().toString())
+//                            .build());
+                } else {
+                    item.setCustUrl(CUSTAPP_ROOT_PATH + "/" + siteEntity.getSiteCode() + "/" + item.getAppCode() + "/" + item.getVersion()+ "/");
                 }
 
             } else {
                 item.setCustUrl("");
             }
             //构建图标地址
-            if(!ObjectUtils.isEmpty(domainUrl)){
+            if (!ObjectUtils.isEmpty(domainUrl)) {
+                String appIconUrl = String.format("%s/%s", domainUrl, item.getAppIconPath());
+                item.setAppIconUrl(appIconUrl);
+/*
                 item.setAppIconUrl(UrlBuilder.ofHttp(domainUrl)
-                        .addPath(item.getAppIconPath()).build());
-            }else{
+                        .addPath(item.getAppIconPath()).build());*/
+            } else {
                 item.setAppIconUrl(item.getAppIconPath());
             }
 
@@ -430,6 +443,11 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
     }
 
     public static void main(String[] args) {
+        String domain = "www.example.com";
+        boolean isDomain = ReUtil.isMatch("^[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})*\\.[a-zA-Z]{2,}$", domain);
+        System.out.println(isDomain); // true
+
 
+        System.out.println(InternetDomainName.isValid(domain));
     }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/business/web/BusinessController.java

@@ -35,7 +35,6 @@ public class BusinessController extends BaseCRUDJsonBodyMappingController<Busine
     private ParamService paramService;
 
     public BusinessController(){
-        super.setFormClass(BusinessForm.class);
         super.setModuleDesc( "站点业务");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/business/web/BusinessForm.java

-package com.mortals.xhx.module.business.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.business.model.BusinessEntity;
-import com.mortals.xhx.module.business.model.BusinessQuery;
-
-/**
-* Business
-*
-* 站点业务 Form
-*
-* @author zxfei
-* @date 2022-01-13
-*/
-public class BusinessForm extends BaseCRUDFormLong<BusinessEntity> {
-    private BusinessEntity entity = new BusinessEntity();
-    private BusinessQuery query = new BusinessQuery();
-    public BusinessForm(){
-    }
-
-    @Override
-    public BusinessEntity getEntity() {
-        return entity;
-    }
-
-    public void setBusiness(BusinessEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public BusinessQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(BusinessQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/business/web/BusinessMatterController.java

@@ -6,7 +6,6 @@ import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.business.model.BusinessMatterEntity;
 import com.mortals.xhx.module.business.model.BusinessMatterQuery;
@@ -39,7 +38,6 @@ public class BusinessMatterController extends BaseCRUDJsonBodyMappingController<
     private ParamService paramService;
 
     public BusinessMatterController() {
-        super.setFormClass(BusinessMatterForm.class);
         super.setModuleDesc("业务事项关联");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/business/web/BusinessMatterForm.java

-package com.mortals.xhx.module.business.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.business.model.BusinessMatterEntity;
-import com.mortals.xhx.module.business.model.BusinessMatterQuery;
-
-/**
-* BusinessMatter
-*
-* 业务事项关联 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class BusinessMatterForm extends BaseCRUDFormLong<BusinessMatterEntity> {
-    private BusinessMatterEntity entity = new BusinessMatterEntity();
-    private BusinessMatterQuery query = new BusinessMatterQuery();
-    public BusinessMatterForm(){
-    }
-
-    @Override
-    public BusinessMatterEntity getEntity() {
-        return entity;
-    }
-
-    public void setBusinessMatter(BusinessMatterEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public BusinessMatterQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(BusinessMatterQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/dept/service/impl/DeptServiceImpl.java

@@ -125,7 +125,8 @@ public class DeptServiceImpl extends AbstractCRUDCacheServiceImpl<DeptDao, DeptE
             for (Map.Entry<String, String> item : data.entrySet()) {
                 String deptCode = item.getKey();
                 String deptName = item.getValue();
-                DeptEntity deptEntity = deptService.selectOne(new DeptQuery().siteId(siteId).deptNumber(deptCode), context);
+                DeptEntity deptEntity = deptService.getExtCache(deptCode);
+               // DeptEntity deptEntity = deptService.selectOne(new DeptQuery().siteId(siteId).deptNumber(deptCode), context);
                 if (ObjectUtils.isEmpty(deptEntity)) {
                     deptEntity = new DeptEntity();
                     deptEntity.initAttrValue();
@@ -137,14 +138,15 @@ public class DeptServiceImpl extends AbstractCRUDCacheServiceImpl<DeptDao, DeptE
                     deptEntity.setCreateTime(new Date());
                     deptEntity.setCreateUserId(1L);
                     deptService.save(deptEntity, context);
-                } else {
+                }
+/*                else {
                     //更新
                     deptEntity.setName(deptName);
                     deptEntity.setSource(SourceEnum.政务网.getValue());
                     deptEntity.setUpdateTime(new Date());
                     deptEntity.setUpdateUserId(1L);
                     deptService.update(deptEntity, context);
-                }
+                }*/
                 sortN++;
             }
         } else {

base-manager/src/main/java/com/mortals/xhx/module/dept/web/DeptController.java

@@ -48,7 +48,6 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic
     private SiteService siteService;
 
     public DeptController() {
-        super.setFormClass(DeptForm.class);
         super.setModuleDesc("部门");
     }
 
@@ -63,7 +62,7 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic
 
         if(!ObjectUtils.isEmpty(query.getFilter())&& YesNoEnum.YES.getValue()==query.getFilter()){
             //过滤部门事项数据为0的部门
-            query.setTotalStart(0);
+            query.setTotalStart(1);
         }
         super.doListBefore(query, model, context);
     }

base-manager/src/main/java/com/mortals/xhx/module/dept/web/DeptForm.java

-package com.mortals.xhx.module.dept.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.dept.model.DeptEntity;
-import com.mortals.xhx.module.dept.model.DeptQuery;
-
-/**
-* Dept
-*
-* 部门 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class DeptForm extends BaseCRUDFormLong<DeptEntity> {
-    private DeptEntity entity = new DeptEntity();
-    private DeptQuery query = new DeptQuery();
-    public DeptForm(){
-    }
-
-    @Override
-    public DeptEntity getEntity() {
-        return entity;
-    }
-
-    public void setDept(DeptEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public DeptQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(DeptQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/holiday/web/HolidayController.java

@@ -26,7 +26,6 @@ public class HolidayController extends BaseCRUDJsonBodyMappingController<Holiday
     private ParamService paramService;
 
     public HolidayController() {
-        super.setFormClass(HolidayForm.class);
         super.setModuleDesc("节假日");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/holiday/web/HolidayForm.java

-package com.mortals.xhx.module.holiday.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.holiday.model.HolidayEntity;
-import com.mortals.xhx.module.holiday.model.HolidayQuery;
-
-/**
-* Holiday
-*
-* 节假日 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class HolidayForm extends BaseCRUDFormLong<HolidayEntity> {
-    private HolidayEntity entity = new HolidayEntity();
-    private HolidayQuery query = new HolidayQuery();
-    public HolidayForm(){
-    }
-
-    @Override
-    public HolidayEntity getEntity() {
-        return entity;
-    }
-
-    public void setHoliday(HolidayEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public HolidayQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(HolidayQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/dao/MatterDao.java

@@ -20,5 +20,8 @@ public interface MatterDao extends ICRUDDao<MatterEntity, Long> {
     String SQLID_SUB_LIST = "getSubList";
     String SQLID_SUB_COUNT = "getSubListCount";
 
+
     Result<MatterEntity> getSubList(MatterEntity matterQuery, PageInfo pageInfo);
+
+    List<MatterEntity> getMatterListByAreaCode(MatterEntity matterQuery);
 }

base-manager/src/main/java/com/mortals/xhx/module/matter/dao/ibatis/MatterDaoImpl.java

@@ -26,6 +26,7 @@ import java.util.List;
 public class MatterDaoImpl extends BaseCRUDDaoMybatis<MatterEntity, Long> implements MatterDao {
 
 
+
     @Override
     public Result<MatterEntity> getSubList(MatterEntity matterQuery, PageInfo pageInfo) {
         Result<MatterEntity> result = new Result();
@@ -49,4 +50,13 @@ public class MatterDaoImpl extends BaseCRUDDaoMybatis<MatterEntity, Long> implem
     public int getSubCount(ParamDto paramDto) {
         return this.getSqlSession().selectOne(this.getSqlId(SQLID_SUB_COUNT), this.cpyQueryParamDto(paramDto));
     }
+
+    @Override
+    public List<MatterEntity> getMatterListByAreaCode(MatterEntity matterQuery) {
+
+        ParamDto param = new ParamDto();
+        param.getCondition().put("areaCode", matterQuery.getAreaCode());
+        return this.getSqlSession().selectList(this.getSqlId("getMatterListByAreaCode"), param);
+    }
+
 }

base-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterAcceptService.java

 package com.mortals.xhx.module.matter.service;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.matter.dao.MatterAcceptDao;
+import com.mortals.xhx.module.matter.dao.MatterExtDao;
 import com.mortals.xhx.module.matter.model.MatterAcceptEntity;
 
 
@@ -14,6 +16,8 @@ import com.mortals.xhx.module.matter.model.MatterAcceptEntity;
 */
 public interface MatterAcceptService extends ICRUDService<MatterAcceptEntity,Long>{
 
+    MatterAcceptDao getDao();
+
     void deleteByMatterId(Long matterId, Context context);
 
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterChargesService.java

 package com.mortals.xhx.module.matter.service;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.matter.dao.MatterChargesDao;
+import com.mortals.xhx.module.matter.dao.MatterExtDao;
 import com.mortals.xhx.module.matter.model.MatterChargesEntity;
 /**
 * MatterChargesService
@@ -12,6 +14,9 @@ import com.mortals.xhx.module.matter.model.MatterChargesEntity;
 */
 public interface MatterChargesService extends ICRUDService<MatterChargesEntity,Long>{
 
+
+    MatterChargesDao getDao();
+
     void deleteByMatterId(Long matterId, Context context);
 
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterDatumFileService.java

 package com.mortals.xhx.module.matter.service;
 import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.matter.dao.MatterDatumDao;
+import com.mortals.xhx.module.matter.dao.MatterDatumFileDao;
+import com.mortals.xhx.module.matter.dao.MatterExtDao;
 import com.mortals.xhx.module.matter.model.MatterDatumFileEntity;
 
 import javax.naming.Context;
@@ -14,6 +17,8 @@ import javax.naming.Context;
 */
 public interface MatterDatumFileService extends ICRUDService<MatterDatumFileEntity,Long>{
 
+    MatterDatumFileDao getDao();
+
     void deleteFileByDatumId(Long datumId, Context context);
 
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterDatumService.java

 package com.mortals.xhx.module.matter.service;
+
 import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.matter.dao.MatterDatumDao;
+import com.mortals.xhx.module.matter.dao.MatterExtDao;
 import com.mortals.xhx.module.matter.model.MatterDatumEntity;
+
 /**
-* MatterDatumService
-*
-* 事项申请材料 service接口
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public interface MatterDatumService extends ICRUDService<MatterDatumEntity,Long>{
+ * MatterDatumService
+ * <p>
+ * 事项申请材料 service接口
+ *
+ * @author zxfei
+ * @date 2022-01-12
+ */
+public interface MatterDatumService extends ICRUDService<MatterDatumEntity, Long> {
 
+    MatterDatumDao getDao();
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterExtService.java

 package com.mortals.xhx.module.matter.service;
 import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.matter.dao.MatterExtDao;
 import com.mortals.xhx.module.matter.model.MatterExtEntity;
 /**
 * MatterExtService
@@ -11,4 +12,5 @@ import com.mortals.xhx.module.matter.model.MatterExtEntity;
 */
 public interface MatterExtService extends ICRUDService<MatterExtEntity,Long>{
 
+    MatterExtDao getDao();
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterFlowlimitService.java

 package com.mortals.xhx.module.matter.service;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.matter.dao.MatterExtDao;
+import com.mortals.xhx.module.matter.dao.MatterFlowlimitDao;
 import com.mortals.xhx.module.matter.model.MatterFlowlimitEntity;
 /**
 * MatterFlowlimitService
@@ -13,5 +15,7 @@ import com.mortals.xhx.module.matter.model.MatterFlowlimitEntity;
 public interface MatterFlowlimitService extends ICRUDService<MatterFlowlimitEntity,Long>{
 
 
+    MatterFlowlimitDao getDao();
+
     void deleteByMatterId(Long matterId, Context context);
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterIntermediaryService.java

 package com.mortals.xhx.module.matter.service;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.matter.dao.MatterExtDao;
+import com.mortals.xhx.module.matter.dao.MatterIntermediaryDao;
 import com.mortals.xhx.module.matter.model.MatterIntermediaryEntity;
 /**
 * MatterIntermediaryService
@@ -12,5 +14,7 @@ import com.mortals.xhx.module.matter.model.MatterIntermediaryEntity;
 */
 public interface MatterIntermediaryService extends ICRUDService<MatterIntermediaryEntity,Long>{
 
+    MatterIntermediaryDao getDao();
+
     void deleteByMatterId(Long matterId, Context context);
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterQuestionService.java

 package com.mortals.xhx.module.matter.service;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.matter.dao.MatterExtDao;
+import com.mortals.xhx.module.matter.dao.MatterQuestionDao;
 import com.mortals.xhx.module.matter.model.MatterQuestionEntity;
 /**
 * MatterQuestionService
@@ -12,5 +14,7 @@ import com.mortals.xhx.module.matter.model.MatterQuestionEntity;
 */
 public interface MatterQuestionService extends ICRUDService<MatterQuestionEntity,Long>{
 
+    MatterQuestionDao getDao();
+
     void deleteByMatterId(Long matterId, Context context);
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterService.java

@@ -6,6 +6,7 @@ import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.matter.dao.MatterDao;
 import com.mortals.xhx.module.matter.model.MatterEntity;
 import com.mortals.xhx.module.matter.model.MatterQuery;
 import com.mortals.xhx.module.matter.model.vo.MatterInfo;
@@ -25,6 +26,7 @@ import java.util.Map;
 public interface MatterService extends ICRUDService<MatterEntity, Long> {
 
 
+    MatterDao getDao();
     /**
      * 添加业务到站点
      *

base-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterSetbaseService.java

 package com.mortals.xhx.module.matter.service;
+
 import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.matter.dao.MatterExtDao;
+import com.mortals.xhx.module.matter.dao.MatterSetbaseDao;
 import com.mortals.xhx.module.matter.model.MatterSetbaseEntity;
+import com.mortals.xhx.module.matter.model.MatterSetbaseQuery;
+
 /**
-* MatterSetbaseService
-*
-* 事项设定依据 service接口
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public interface MatterSetbaseService extends ICRUDService<MatterSetbaseEntity,Long>{
+ * MatterSetbaseService
+ * <p>
+ * 事项设定依据 service接口
+ *
+ * @author zxfei
+ * @date 2022-01-12
+ */
+public interface MatterSetbaseService extends ICRUDService<MatterSetbaseEntity, Long> {
+
+    MatterSetbaseDao getDao();
 
     void deleteByMatterId(Long matterId, Context context);
 

base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java

@@ -1019,7 +1019,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
         //根据事项url 获取事项详细信息，构建相关详细信息
         String html = null;
         try {
-            Document dom = Jsoup.connect(matterEntity.getUrl()).get();
+            Document dom = Jsoup.connect(matterEntity.getUrl()).timeout(30*1000).get();
             // html = Jsoup.connect(matterEntity.getUrl()).get().body().html();
             // html = HttpUtil.get(matterEntity.getUrl());
             //System.out.println(html);
@@ -1199,6 +1199,10 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
         }
 
         if (!ObjectUtils.isEmpty(matterExtEntities)) {
+
+            //先删除后添加
+
+
             matterExtService.save(matterExtEntities, null);
         }
 

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterAcceptController.java

@@ -26,7 +26,6 @@ public class MatterAcceptController extends BaseCRUDJsonBodyMappingController<Ma
     private ParamService paramService;
 
     public MatterAcceptController() {
-        super.setFormClass(MatterAcceptForm.class);
         super.setModuleDesc("事项受理条件");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterAcceptForm.java

-package com.mortals.xhx.module.matter.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.matter.model.MatterAcceptEntity;
-import com.mortals.xhx.module.matter.model.MatterAcceptQuery;
-
-/**
-* MatterAccept
-*
-* 事项受理条件 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class MatterAcceptForm extends BaseCRUDFormLong<MatterAcceptEntity> {
-    private MatterAcceptEntity entity = new MatterAcceptEntity();
-    private MatterAcceptQuery query = new MatterAcceptQuery();
-    public MatterAcceptForm(){
-    }
-
-    @Override
-    public MatterAcceptEntity getEntity() {
-        return entity;
-    }
-
-    public void setMatterAccept(MatterAcceptEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public MatterAcceptQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(MatterAcceptQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterChargesController.java

@@ -26,7 +26,6 @@ public class MatterChargesController extends BaseCRUDJsonBodyMappingController<M
     private ParamService paramService;
 
     public MatterChargesController() {
-        super.setFormClass(MatterChargesForm.class);
         super.setModuleDesc("事项收费标准");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterChargesForm.java

-package com.mortals.xhx.module.matter.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.matter.model.MatterChargesEntity;
-import com.mortals.xhx.module.matter.model.MatterChargesQuery;
-
-/**
-* MatterCharges
-*
-* 事项收费标准 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class MatterChargesForm extends BaseCRUDFormLong<MatterChargesEntity> {
-    private MatterChargesEntity entity = new MatterChargesEntity();
-    private MatterChargesQuery query = new MatterChargesQuery();
-    public MatterChargesForm(){
-    }
-
-    @Override
-    public MatterChargesEntity getEntity() {
-        return entity;
-    }
-
-    public void setMatterCharges(MatterChargesEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public MatterChargesQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(MatterChargesQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterController.java

@@ -52,7 +52,6 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
     private SiteThemeService siteThemeService;
 
     public MatterController() {
-        super.setFormClass(MatterForm.class);
         super.setModuleDesc("基础事项");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumController.java

@@ -33,7 +33,6 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
     private MatterDatumFileService matterDatumFileService;
 
     public MatterDatumController() {
-        super.setFormClass(MatterDatumForm.class);
         super.setModuleDesc("事项申请材料");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumFileController.java

@@ -26,7 +26,6 @@ public class MatterDatumFileController extends BaseCRUDJsonBodyMappingController
     private ParamService paramService;
 
     public MatterDatumFileController(){
-        super.setFormClass(MatterDatumFileForm.class);
         super.setModuleDesc( "材料附件");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumFileForm.java

-package com.mortals.xhx.module.matter.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.matter.model.MatterDatumFileEntity;
-import com.mortals.xhx.module.matter.model.MatterDatumFileQuery;
-
-/**
-* MatterDatumFile
-*
-* 材料附件 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class MatterDatumFileForm extends BaseCRUDFormLong<MatterDatumFileEntity> {
-    private MatterDatumFileEntity entity = new MatterDatumFileEntity();
-    private MatterDatumFileQuery query = new MatterDatumFileQuery();
-    public MatterDatumFileForm(){
-    }
-
-    @Override
-    public MatterDatumFileEntity getEntity() {
-        return entity;
-    }
-
-    public void setMatterDatumFile(MatterDatumFileEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public MatterDatumFileQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(MatterDatumFileQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumForm.java

-package com.mortals.xhx.module.matter.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.matter.model.MatterDatumEntity;
-import com.mortals.xhx.module.matter.model.MatterDatumQuery;
-
-/**
-* MatterDatum
-*
-* 事项申请材料 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class MatterDatumForm extends BaseCRUDFormLong<MatterDatumEntity> {
-    private MatterDatumEntity entity = new MatterDatumEntity();
-    private MatterDatumQuery query = new MatterDatumQuery();
-    public MatterDatumForm(){
-    }
-
-    @Override
-    public MatterDatumEntity getEntity() {
-        return entity;
-    }
-
-    public void setMatterDatum(MatterDatumEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public MatterDatumQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(MatterDatumQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterFlowlimitController.java

@@ -26,7 +26,6 @@ public class MatterFlowlimitController extends BaseCRUDJsonBodyMappingController
     private ParamService paramService;
 
     public MatterFlowlimitController() {
-        super.setFormClass(MatterFlowlimitForm.class);
         super.setModuleDesc("事项办理流程");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterFlowlimitForm.java

-package com.mortals.xhx.module.matter.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.matter.model.MatterFlowlimitEntity;
-import com.mortals.xhx.module.matter.model.MatterFlowlimitQuery;
-
-/**
-* MatterFlowlimit
-*
-* 事项办理流程 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class MatterFlowlimitForm extends BaseCRUDFormLong<MatterFlowlimitEntity> {
-    private MatterFlowlimitEntity entity = new MatterFlowlimitEntity();
-    private MatterFlowlimitQuery query = new MatterFlowlimitQuery();
-    public MatterFlowlimitForm(){
-    }
-
-    @Override
-    public MatterFlowlimitEntity getEntity() {
-        return entity;
-    }
-
-    public void setMatterFlowlimit(MatterFlowlimitEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public MatterFlowlimitQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(MatterFlowlimitQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterForm.java

-package com.mortals.xhx.module.matter.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.matter.model.MatterEntity;
-import com.mortals.xhx.module.matter.model.MatterQuery;
-
-/**
-* Matter
-*
-* 基础事项 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class MatterForm extends BaseCRUDFormLong<MatterEntity> {
-    private MatterEntity entity = new MatterEntity();
-    private MatterQuery query = new MatterQuery();
-    public MatterForm(){
-    }
-
-    @Override
-    public MatterEntity getEntity() {
-        return entity;
-    }
-
-    public void setMatter(MatterEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public MatterQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(MatterQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterIntermediaryController.java

@@ -26,7 +26,6 @@ public class MatterIntermediaryController extends BaseCRUDJsonBodyMappingControl
     private ParamService paramService;
 
     public MatterIntermediaryController() {
-        super.setFormClass(MatterIntermediaryForm.class);
         super.setModuleDesc("事项中介服务");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterIntermediaryForm.java

-package com.mortals.xhx.module.matter.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.matter.model.MatterIntermediaryEntity;
-import com.mortals.xhx.module.matter.model.MatterIntermediaryQuery;
-
-/**
-* MatterIntermediary
-*
-* 事项中介服务 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class MatterIntermediaryForm extends BaseCRUDFormLong<MatterIntermediaryEntity> {
-    private MatterIntermediaryEntity entity = new MatterIntermediaryEntity();
-    private MatterIntermediaryQuery query = new MatterIntermediaryQuery();
-    public MatterIntermediaryForm(){
-    }
-
-    @Override
-    public MatterIntermediaryEntity getEntity() {
-        return entity;
-    }
-
-    public void setMatterIntermediary(MatterIntermediaryEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public MatterIntermediaryQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(MatterIntermediaryQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterQuestionController.java

@@ -26,7 +26,6 @@ public class MatterQuestionController extends BaseCRUDJsonBodyMappingController<
     private ParamService paramService;
 
     public MatterQuestionController() {
-        super.setFormClass(MatterQuestionForm.class);
         super.setModuleDesc("事项常见问题");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterQuestionForm.java

-package com.mortals.xhx.module.matter.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.matter.model.MatterQuestionEntity;
-import com.mortals.xhx.module.matter.model.MatterQuestionQuery;
-
-/**
-* MatterQuestion
-*
-* 事项常见问题 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class MatterQuestionForm extends BaseCRUDFormLong<MatterQuestionEntity> {
-    private MatterQuestionEntity entity = new MatterQuestionEntity();
-    private MatterQuestionQuery query = new MatterQuestionQuery();
-    public MatterQuestionForm(){
-    }
-
-    @Override
-    public MatterQuestionEntity getEntity() {
-        return entity;
-    }
-
-    public void setMatterQuestion(MatterQuestionEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public MatterQuestionQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(MatterQuestionQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterSetbaseController.java

@@ -26,7 +26,6 @@ public class MatterSetbaseController extends BaseCRUDJsonBodyMappingController<M
     private ParamService paramService;
 
     public MatterSetbaseController() {
-        super.setFormClass(MatterSetbaseForm.class);
         super.setModuleDesc("事项设定依据");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterSetbaseForm.java

-package com.mortals.xhx.module.matter.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.matter.model.MatterSetbaseEntity;
-import com.mortals.xhx.module.matter.model.MatterSetbaseQuery;
-
-/**
-* MatterSetbase
-*
-* 事项设定依据 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class MatterSetbaseForm extends BaseCRUDFormLong<MatterSetbaseEntity> {
-    private MatterSetbaseEntity entity = new MatterSetbaseEntity();
-    private MatterSetbaseQuery query = new MatterSetbaseQuery();
-    public MatterSetbaseForm(){
-    }
-
-    @Override
-    public MatterSetbaseEntity getEntity() {
-        return entity;
-    }
-
-    public void setMatterSetbase(MatterSetbaseEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public MatterSetbaseQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(MatterSetbaseQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/model/web/ModelController.java

@@ -39,7 +39,6 @@ public class ModelController extends BaseCRUDJsonBodyMappingController<ModelServ
     private ParamService paramService;
 
     public ModelController() {
-        super.setFormClass(ModelForm.class);
         super.setModuleDesc("模块");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/model/web/ModelForm.java

-package com.mortals.xhx.module.model.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.model.model.ModelEntity;
-import com.mortals.xhx.module.model.model.ModelQuery;
-
-/**
-* Model
-*
-* 模块 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class ModelForm extends BaseCRUDFormLong<ModelEntity> {
-    private ModelEntity entity = new ModelEntity();
-    private ModelQuery query = new ModelQuery();
-    public ModelForm(){
-    }
-
-    @Override
-    public ModelEntity getEntity() {
-        return entity;
-    }
-
-    public void setModel(ModelEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public ModelQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(ModelQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/product/web/ProductController.java

@@ -38,7 +38,6 @@ public class ProductController extends BaseCRUDJsonBodyMappingController<Product
     private ParamService paramService;
 
     public ProductController(){
-        super.setFormClass(ProductForm.class);
         super.setModuleDesc( "产品");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/product/web/ProductForm.java

-package com.mortals.xhx.module.product.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.product.model.ProductEntity;
-import com.mortals.xhx.module.product.model.ProductQuery;
-
-/**
-* Product
-*
-* 产品 Form
-*
-* @author zxfei
-* @date 2022-05-24
-*/
-public class ProductForm extends BaseCRUDFormLong<ProductEntity> {
-    private ProductEntity entity = new ProductEntity();
-    private ProductQuery query = new ProductQuery();
-    public ProductForm(){
-    }
-
-    @Override
-    public ProductEntity getEntity() {
-        return entity;
-    }
-
-    public void setProduct(ProductEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public ProductQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(ProductQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

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/SiteHallQuery.java

+package com.mortals.xhx.module.site.model;
+
+import java.util.List;
+import com.mortals.xhx.module.site.model.SiteHallEntity;
+/**
+* 站点大厅信息查询对象
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+public class SiteHallQuery extends SiteHallEntity {
+    /** 开始 序号，主键，自增长 */
+    private Long idStart;
+
+    /** 结束 序号，主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 序号，主键，自增长 */
+    private Long idIncrement;
+
+    /** 序号，主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 序号，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
+    /** 开始 站点ID */
+    private Long siteIdStart;
+
+    /** 结束 站点ID */
+    private Long siteIdEnd;
+
+    /** 增加 站点ID */
+    private Long siteIdIncrement;
+
+    /** 站点ID列表 */
+    private List <Long> siteIdList;
+
+    /** 站点ID排除列表 */
+    private List <Long> siteIdNotList;
+
+    /** 站点名称 */
+    private List<String> siteNameList;
+
+    /** 站点名称排除列表 */
+    private List <String> siteNameNotList;
+    /** 大厅名称 */
+    private List<String> hallNameList;
+
+    /** 大厅名称排除列表 */
+    private List <String> hallNameNotList;
+    /** 地址 */
+    private List<String> addressList;
+
+    /** 地址排除列表 */
+    private List <String> addressNotList;
+    /** 开始 楼层 */
+    private Integer floorStart;
+
+    /** 结束 楼层 */
+    private Integer floorEnd;
+
+    /** 增加 楼层 */
+    private Integer floorIncrement;
+
+    /** 楼层列表 */
+    private List <Integer> floorList;
+
+    /** 楼层排除列表 */
+    private List <Integer> floorNotList;
+
+    /** 开始 楼栋 */
+    private Integer buildStart;
+
+    /** 结束 楼栋 */
+    private Integer buildEnd;
+
+    /** 增加 楼栋 */
+    private Integer buildIncrement;
+
+    /** 楼栋列表 */
+    private List <Integer> buildList;
+
+    /** 楼栋排除列表 */
+    private List <Integer> buildNotList;
+
+    /** 备注 */
+    private List<String> remarkList;
+
+    /** 备注排除列表 */
+    private List <String> remarkNotList;
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 创建用户排除列表 */
+    private List <Long> createUserIdNotList;
+
+    /** 开始 更新用户 */
+    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<SiteHallQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<SiteHallQuery> andConditionList;
+
+    public SiteHallQuery(){}
+
+    /**
+    * 获取 开始 序号，主键，自增长
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 序号，主键，自增长
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 序号，主键，自增长
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 序号，主键，自增长
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 序号，主键，自增长
+    * @return idNotList
+    */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idNotList
+    */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
+    /**
+    * 获取 开始 站点ID
+    * @return siteIdStart
+    */
+    public Long getSiteIdStart(){
+        return this.siteIdStart;
+    }
+
+    /**
+    * 设置 开始 站点ID
+    * @param siteIdStart
+    */
+    public void setSiteIdStart(Long siteIdStart){
+        this.siteIdStart = siteIdStart;
+    }
+
+    /**
+    * 获取 结束 站点ID
+    * @return $siteIdEnd
+    */
+    public Long getSiteIdEnd(){
+        return this.siteIdEnd;
+    }
+
+    /**
+    * 设置 结束 站点ID
+    * @param siteIdEnd
+    */
+    public void setSiteIdEnd(Long siteIdEnd){
+        this.siteIdEnd = siteIdEnd;
+    }
+
+    /**
+    * 获取 增加 站点ID
+    * @return siteIdIncrement
+    */
+    public Long getSiteIdIncrement(){
+        return this.siteIdIncrement;
+    }
+
+    /**
+    * 设置 增加 站点ID
+    * @param siteIdIncrement
+    */
+    public void setSiteIdIncrement(Long siteIdIncrement){
+        this.siteIdIncrement = siteIdIncrement;
+    }
+
+    /**
+    * 获取 站点ID
+    * @return siteIdList
+    */
+    public List<Long> getSiteIdList(){
+        return this.siteIdList;
+    }
+
+    /**
+    * 设置 站点ID
+    * @param siteIdList
+    */
+    public void setSiteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+    }
+
+    /**
+    * 获取 站点ID
+    * @return siteIdNotList
+    */
+    public List<Long> getSiteIdNotList(){
+        return this.siteIdNotList;
+    }
+
+    /**
+    * 设置 站点ID
+    * @param siteIdNotList
+    */
+    public void setSiteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+    }
+
+
+    /**
+    * 获取 站点名称
+    * @return siteNameList
+    */
+    public List<String> getSiteNameList(){
+        return this.siteNameList;
+    }
+
+    /**
+    * 设置 站点名称
+    * @param siteNameList
+    */
+    public void setSiteNameList(List<String> siteNameList){
+        this.siteNameList = siteNameList;
+    }
+
+    /**
+    * 获取 站点名称
+    * @return siteNameNotList
+    */
+    public List<String> getSiteNameNotList(){
+        return this.siteNameNotList;
+    }
+
+    /**
+    * 设置 站点名称
+    * @param siteNameNotList
+    */
+    public void setSiteNameNotList(List<String> siteNameNotList){
+        this.siteNameNotList = siteNameNotList;
+    }
+
+    /**
+    * 获取 大厅名称
+    * @return hallNameList
+    */
+    public List<String> getHallNameList(){
+        return this.hallNameList;
+    }
+
+    /**
+    * 设置 大厅名称
+    * @param hallNameList
+    */
+    public void setHallNameList(List<String> hallNameList){
+        this.hallNameList = hallNameList;
+    }
+
+    /**
+    * 获取 大厅名称
+    * @return hallNameNotList
+    */
+    public List<String> getHallNameNotList(){
+        return this.hallNameNotList;
+    }
+
+    /**
+    * 设置 大厅名称
+    * @param hallNameNotList
+    */
+    public void setHallNameNotList(List<String> hallNameNotList){
+        this.hallNameNotList = hallNameNotList;
+    }
+
+    /**
+    * 获取 地址
+    * @return addressList
+    */
+    public List<String> getAddressList(){
+        return this.addressList;
+    }
+
+    /**
+    * 设置 地址
+    * @param addressList
+    */
+    public void setAddressList(List<String> addressList){
+        this.addressList = addressList;
+    }
+
+    /**
+    * 获取 地址
+    * @return addressNotList
+    */
+    public List<String> getAddressNotList(){
+        return this.addressNotList;
+    }
+
+    /**
+    * 设置 地址
+    * @param addressNotList
+    */
+    public void setAddressNotList(List<String> addressNotList){
+        this.addressNotList = addressNotList;
+    }
+
+    /**
+    * 获取 开始 楼层
+    * @return floorStart
+    */
+    public Integer getFloorStart(){
+        return this.floorStart;
+    }
+
+    /**
+    * 设置 开始 楼层
+    * @param floorStart
+    */
+    public void setFloorStart(Integer floorStart){
+        this.floorStart = floorStart;
+    }
+
+    /**
+    * 获取 结束 楼层
+    * @return $floorEnd
+    */
+    public Integer getFloorEnd(){
+        return this.floorEnd;
+    }
+
+    /**
+    * 设置 结束 楼层
+    * @param floorEnd
+    */
+    public void setFloorEnd(Integer floorEnd){
+        this.floorEnd = floorEnd;
+    }
+
+    /**
+    * 获取 增加 楼层
+    * @return floorIncrement
+    */
+    public Integer getFloorIncrement(){
+        return this.floorIncrement;
+    }
+
+    /**
+    * 设置 增加 楼层
+    * @param floorIncrement
+    */
+    public void setFloorIncrement(Integer floorIncrement){
+        this.floorIncrement = floorIncrement;
+    }
+
+    /**
+    * 获取 楼层
+    * @return floorList
+    */
+    public List<Integer> getFloorList(){
+        return this.floorList;
+    }
+
+    /**
+    * 设置 楼层
+    * @param floorList
+    */
+    public void setFloorList(List<Integer> floorList){
+        this.floorList = floorList;
+    }
+
+    /**
+    * 获取 楼层
+    * @return floorNotList
+    */
+    public List<Integer> getFloorNotList(){
+        return this.floorNotList;
+    }
+
+    /**
+    * 设置 楼层
+    * @param floorNotList
+    */
+    public void setFloorNotList(List<Integer> floorNotList){
+        this.floorNotList = floorNotList;
+    }
+
+
+    /**
+    * 获取 开始 楼栋
+    * @return buildStart
+    */
+    public Integer getBuildStart(){
+        return this.buildStart;
+    }
+
+    /**
+    * 设置 开始 楼栋
+    * @param buildStart
+    */
+    public void setBuildStart(Integer buildStart){
+        this.buildStart = buildStart;
+    }
+
+    /**
+    * 获取 结束 楼栋
+    * @return $buildEnd
+    */
+    public Integer getBuildEnd(){
+        return this.buildEnd;
+    }
+
+    /**
+    * 设置 结束 楼栋
+    * @param buildEnd
+    */
+    public void setBuildEnd(Integer buildEnd){
+        this.buildEnd = buildEnd;
+    }
+
+    /**
+    * 获取 增加 楼栋
+    * @return buildIncrement
+    */
+    public Integer getBuildIncrement(){
+        return this.buildIncrement;
+    }
+
+    /**
+    * 设置 增加 楼栋
+    * @param buildIncrement
+    */
+    public void setBuildIncrement(Integer buildIncrement){
+        this.buildIncrement = buildIncrement;
+    }
+
+    /**
+    * 获取 楼栋
+    * @return buildList
+    */
+    public List<Integer> getBuildList(){
+        return this.buildList;
+    }
+
+    /**
+    * 设置 楼栋
+    * @param buildList
+    */
+    public void setBuildList(List<Integer> buildList){
+        this.buildList = buildList;
+    }
+
+    /**
+    * 获取 楼栋
+    * @return buildNotList
+    */
+    public List<Integer> getBuildNotList(){
+        return this.buildNotList;
+    }
+
+    /**
+    * 设置 楼栋
+    * @param buildNotList
+    */
+    public void setBuildNotList(List<Integer> buildNotList){
+        this.buildNotList = buildNotList;
+    }
+
+
+    /**
+    * 获取 备注
+    * @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 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 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 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;
+    }
+
+    /**
+    * 设置  序号，主键，自增长
+    * @param id
+    */
+    public SiteHallQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public SiteHallQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public SiteHallQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public SiteHallQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public SiteHallQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+        /**
+        * 设置 序号，主键，自增长
+        * @param idNotList
+        */
+        public SiteHallQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+        }
+
+    /**
+    * 设置  站点ID
+    * @param siteId
+    */
+    public SiteHallQuery siteId(Long siteId){
+	    setSiteId(siteId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 站点ID
+    * @param siteIdStart
+    */
+    public SiteHallQuery siteIdStart(Long siteIdStart){
+		this.siteIdStart = siteIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 站点ID
+    * @param siteIdEnd
+    */
+    public SiteHallQuery siteIdEnd(Long siteIdEnd){
+		this.siteIdEnd = siteIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 站点ID
+    * @param siteIdIncrement
+    */
+    public SiteHallQuery siteIdIncrement(Long siteIdIncrement){
+		this.siteIdIncrement = siteIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 站点ID
+    * @param siteIdList
+    */
+    public SiteHallQuery siteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+		return this;
+        }
+
+        /**
+        * 设置 站点ID
+        * @param siteIdNotList
+        */
+        public SiteHallQuery siteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 站点名称
+    * @param siteName
+    */
+    public SiteHallQuery siteName(String siteName){
+        setSiteName(siteName);
+		return this;
+    }
+
+    /**
+    * 设置 站点名称
+    * @param siteNameList
+    */
+    public SiteHallQuery siteNameList(List<String> siteNameList){
+        this.siteNameList = siteNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 大厅名称
+    * @param hallName
+    */
+    public SiteHallQuery hallName(String hallName){
+        setHallName(hallName);
+		return this;
+    }
+
+    /**
+    * 设置 大厅名称
+    * @param hallNameList
+    */
+    public SiteHallQuery hallNameList(List<String> hallNameList){
+        this.hallNameList = hallNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 地址
+    * @param address
+    */
+    public SiteHallQuery address(String address){
+        setAddress(address);
+		return this;
+    }
+
+    /**
+    * 设置 地址
+    * @param addressList
+    */
+    public SiteHallQuery addressList(List<String> addressList){
+        this.addressList = addressList;
+		return this;
+    }
+
+    /**
+    * 设置  楼层
+    * @param floor
+    */
+    public SiteHallQuery floor(Integer floor){
+	    setFloor(floor);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 楼层
+    * @param floorStart
+    */
+    public SiteHallQuery floorStart(Integer floorStart){
+		this.floorStart = floorStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 楼层
+    * @param floorEnd
+    */
+    public SiteHallQuery floorEnd(Integer floorEnd){
+		this.floorEnd = floorEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 楼层
+    * @param floorIncrement
+    */
+    public SiteHallQuery floorIncrement(Integer floorIncrement){
+		this.floorIncrement = floorIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 楼层
+    * @param floorList
+    */
+    public SiteHallQuery floorList(List<Integer> floorList){
+        this.floorList = floorList;
+		return this;
+        }
+
+        /**
+        * 设置 楼层
+        * @param floorNotList
+        */
+        public SiteHallQuery floorNotList(List<Integer> floorNotList){
+        this.floorNotList = floorNotList;
+        return this;
+        }
+
+    /**
+    * 设置  楼栋
+    * @param build
+    */
+    public SiteHallQuery build(Integer build){
+	    setBuild(build);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 楼栋
+    * @param buildStart
+    */
+    public SiteHallQuery buildStart(Integer buildStart){
+		this.buildStart = buildStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 楼栋
+    * @param buildEnd
+    */
+    public SiteHallQuery buildEnd(Integer buildEnd){
+		this.buildEnd = buildEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 楼栋
+    * @param buildIncrement
+    */
+    public SiteHallQuery buildIncrement(Integer buildIncrement){
+		this.buildIncrement = buildIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 楼栋
+    * @param buildList
+    */
+    public SiteHallQuery buildList(List<Integer> buildList){
+        this.buildList = buildList;
+		return this;
+        }
+
+        /**
+        * 设置 楼栋
+        * @param buildNotList
+        */
+        public SiteHallQuery buildNotList(List<Integer> buildNotList){
+        this.buildNotList = buildNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 备注
+    * @param remark
+    */
+    public SiteHallQuery remark(String remark){
+        setRemark(remark);
+		return this;
+    }
+
+    /**
+    * 设置 备注
+    * @param remarkList
+    */
+    public SiteHallQuery remarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+		return this;
+    }
+
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public SiteHallQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public SiteHallQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public SiteHallQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public SiteHallQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public SiteHallQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 创建用户
+        * @param createUserIdNotList
+        */
+        public SiteHallQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+        }
+
+    /**
+    * 设置  更新用户
+    * @param updateUserId
+    */
+    public SiteHallQuery updateUserId(Long updateUserId){
+	    setUpdateUserId(updateUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 更新用户
+    * @param updateUserIdStart
+    */
+    public SiteHallQuery updateUserIdStart(Long updateUserIdStart){
+		this.updateUserIdStart = updateUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 更新用户
+    * @param updateUserIdEnd
+    */
+    public SiteHallQuery updateUserIdEnd(Long updateUserIdEnd){
+		this.updateUserIdEnd = updateUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 更新用户
+    * @param updateUserIdIncrement
+    */
+    public SiteHallQuery updateUserIdIncrement(Long updateUserIdIncrement){
+		this.updateUserIdIncrement = updateUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdList
+    */
+    public SiteHallQuery updateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 更新用户
+        * @param updateUserIdNotList
+        */
+        public SiteHallQuery 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<SiteHallQuery> 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<SiteHallQuery> 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<SiteHallQuery> 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<SiteHallQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

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

@@ -291,7 +291,7 @@ public class SiteMatterEntity extends SiteMatterVo {
 
         this.eventTypeShow = null;
 
-        this.source = null;
+        this.source = 0;
 
         this.deptCode = null;
 

base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteThemeMatterEntity.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.SiteThemeMatterVo;
+import lombok.Data;
 /**
-* 站点主题事项实体对象
-*
-* @author zxfei
-* @date 2022-11-23
-*/
-
+ * 站点主题事项实体对象
+ *
+ * @author zxfei
+ * @date 2023-04-23
+ */
+@Data
 public class SiteThemeMatterEntity extends SiteThemeMatterVo {
     private static final long serialVersionUID = 1L;
 
@@ -52,140 +52,14 @@ public class SiteThemeMatterEntity extends SiteThemeMatterVo {
      * 事项来源
      */
     private Integer source;
-
-
-
-    public SiteThemeMatterEntity(){}
-    /**
-    * 获取 站点ID
-    * @return Long
-    */
-    public Long getSiteId(){
-        return siteId;
-    }
-    /**
-    * 设置 站点ID
-    * @param siteId
-    */
-    public void setSiteId(Long siteId){
-        this.siteId = siteId;
-    }
-    /**
-    * 获取 站点名称
-    * @return String
-    */
-    public String getSiteName(){
-        return siteName;
-    }
-    /**
-    * 设置 站点名称
-    * @param siteName
-    */
-    public void setSiteName(String siteName){
-        this.siteName = siteName;
-    }
-    /**
-    * 获取 事项ID
-    * @return Long
-    */
-    public Long getMatterId(){
-        return matterId;
-    }
-    /**
-    * 设置 事项ID
-    * @param matterId
-    */
-    public void setMatterId(Long matterId){
-        this.matterId = matterId;
-    }
-    /**
-    * 获取 事项名称
-    * @return String
-    */
-    public String getMatterName(){
-        return matterName;
-    }
-    /**
-    * 设置 事项名称
-    * @param matterName
-    */
-    public void setMatterName(String matterName){
-        this.matterName = matterName;
-    }
-    /**
-    * 获取 事项编码
-    * @return String
-    */
-    public String getMatterCode(){
-        return matterCode;
-    }
-    /**
-    * 设置 事项编码
-    * @param matterCode
-    */
-    public void setMatterCode(String matterCode){
-        this.matterCode = matterCode;
-    }
-    /**
-    * 获取 服务类型（1.公共服务，2.个人服务，3.法人服务）
-    * @return String
-    */
-    public String getUserType(){
-        return userType;
-    }
-    /**
-    * 设置 服务类型（1.公共服务，2.个人服务，3.法人服务）
-    * @param userType
-    */
-    public void setUserType(String userType){
-        this.userType = userType;
-    }
-    /**
-    * 获取 主题编码
-    * @return String
-    */
-    public String getThemeCode(){
-        return themeCode;
-    }
-    /**
-    * 设置 主题编码
-    * @param themeCode
-    */
-    public void setThemeCode(String themeCode){
-        this.themeCode = themeCode;
-    }
     /**
-    * 获取 主题名称
-    * @return String
+     * 热门(0.否,1.是)
      */
-    public String getThemeName(){
-        return themeName;
-    }
-    /**
-    * 设置 主题名称
-    * @param themeName
-    */
-    public void setThemeName(String themeName){
-        this.themeName = themeName;
-    }
+    private Integer hot;
     /**
-    * 获取 事项来源
-    * @return Integer
+     * 显示(0.否,1.是)
      */
-    public Integer getSource(){
-        return source;
-    }
-    /**
-    * 设置 事项来源
-    * @param source
-    */
-    public void setSource(Integer source){
-        this.source = source;
-    }
-
-
-
-
+    private Integer display;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -202,38 +76,28 @@ public class SiteThemeMatterEntity extends SiteThemeMatterVo {
         return false;
     }
 
-    public String toString(){
-        StringBuilder sb = new StringBuilder("");
-        sb.append(",siteId:").append(getSiteId());
-        sb.append(",siteName:").append(getSiteName());
-        sb.append(",matterId:").append(getMatterId());
-        sb.append(",matterName:").append(getMatterName());
-        sb.append(",matterCode:").append(getMatterCode());
-        sb.append(",userType:").append(getUserType());
-        sb.append(",themeCode:").append(getThemeCode());
-        sb.append(",themeName:").append(getThemeName());
-        sb.append(",source:").append(getSource());
-        return sb.toString();
-    }
-
     public void initAttrValue(){
 
         this.siteId = null;
 
-            this.siteName = null;
+        this.siteName = "";
 
         this.matterId = null;
 
-            this.matterName = null;
+        this.matterName = "";
 
         this.matterCode = null;
 
         this.userType = null;
 
-            this.themeCode = null;
+        this.themeCode = "";
+
+        this.themeName = "";
+
+        this.source = 1;
 
-            this.themeName = null;
+        this.hot = 0;
 
-            this.source = null;
+        this.display = 1;
     }
 }
\ No newline at end of file

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

@@ -3,11 +3,11 @@ package com.mortals.xhx.module.site.model;
 import java.util.List;
 import com.mortals.xhx.module.site.model.SiteThemeMatterEntity;
 /**
-* 站点主题事项查询对象
-*
-* @author zxfei
-* @date 2022-11-23
-*/
+ * 站点主题事项查询对象
+ *
+ * @author zxfei
+ * @date 2023-04-23
+ */
 public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
     /** 开始 序号，主键，自增长 */
     private Long idStart;
@@ -21,6 +21,9 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
     /** 序号，主键，自增长列表 */
     private List <Long> idList;
 
+    /** 序号，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
     /** 开始 站点ID */
     private Long siteIdStart;
 
@@ -33,9 +36,14 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
     /** 站点ID列表 */
     private List <Long> siteIdList;
 
+    /** 站点ID排除列表 */
+    private List <Long> siteIdNotList;
+
     /** 站点名称 */
     private List<String> siteNameList;
 
+    /** 站点名称排除列表 */
+    private List <String> siteNameNotList;
     /** 开始 事项ID */
     private Long matterIdStart;
 
@@ -48,21 +56,34 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
     /** 事项ID列表 */
     private List <Long> matterIdList;
 
+    /** 事项ID排除列表 */
+    private List <Long> matterIdNotList;
+
     /** 事项名称 */
     private List<String> matterNameList;
 
+    /** 事项名称排除列表 */
+    private List <String> matterNameNotList;
     /** 事项编码 */
     private List<String> matterCodeList;
 
+    /** 事项编码排除列表 */
+    private List <String> matterCodeNotList;
     /** 服务类型（1.公共服务，2.个人服务，3.法人服务） */
     private List<String> userTypeList;
 
+    /** 服务类型（1.公共服务，2.个人服务，3.法人服务）排除列表 */
+    private List <String> userTypeNotList;
     /** 主题编码 */
     private List<String> themeCodeList;
 
+    /** 主题编码排除列表 */
+    private List <String> themeCodeNotList;
     /** 主题名称 */
     private List<String> themeNameList;
 
+    /** 主题名称排除列表 */
+    private List <String> themeNameNotList;
     /** 开始 事项来源 */
     private Integer sourceStart;
 
@@ -75,6 +96,9 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
     /** 事项来源列表 */
     private List <Integer> sourceList;
 
+    /** 事项来源排除列表 */
+    private List <Integer> sourceNotList;
+
     /** 开始 创建时间 */
     private String createTimeStart;
 
@@ -93,12 +117,45 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
     /** 创建用户列表 */
     private List <Long> createUserIdList;
 
+    /** 创建用户排除列表 */
+    private List <Long> createUserIdNotList;
+
     /** 开始 修改时间 */
     private String updateTimeStart;
 
     /** 结束 修改时间 */
     private String updateTimeEnd;
 
+    /** 开始 热门(0.否,1.是) */
+    private Integer hotStart;
+
+    /** 结束 热门(0.否,1.是) */
+    private Integer hotEnd;
+
+    /** 增加 热门(0.否,1.是) */
+    private Integer hotIncrement;
+
+    /** 热门(0.否,1.是)列表 */
+    private List <Integer> hotList;
+
+    /** 热门(0.否,1.是)排除列表 */
+    private List <Integer> hotNotList;
+
+    /** 开始 显示(0.否,1.是) */
+    private Integer displayStart;
+
+    /** 结束 显示(0.否,1.是) */
+    private Integer displayEnd;
+
+    /** 增加 显示(0.否,1.是) */
+    private Integer displayIncrement;
+
+    /** 显示(0.否,1.是)列表 */
+    private List <Integer> displayList;
+
+    /** 显示(0.否,1.是)排除列表 */
+    private List <Integer> displayNotList;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<SiteThemeMatterQuery> orConditionList;
 
@@ -171,6 +228,23 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
         this.idList = idList;
     }
 
+    /**
+     * 获取 序号，主键，自增长
+     * @return idNotList
+     */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+     * 设置 序号，主键，自增长
+     * @param idNotList
+     */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
     /**
      * 获取 开始 站点ID
      * @return siteIdStart
@@ -235,6 +309,23 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
         this.siteIdList = siteIdList;
     }
 
+    /**
+     * 获取 站点ID
+     * @return siteIdNotList
+     */
+    public List<Long> getSiteIdNotList(){
+        return this.siteIdNotList;
+    }
+
+    /**
+     * 设置 站点ID
+     * @param siteIdNotList
+     */
+    public void setSiteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+    }
+
+
     /**
      * 获取 站点名称
      * @return siteNameList
@@ -250,6 +341,23 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
     public void setSiteNameList(List<String> siteNameList){
         this.siteNameList = siteNameList;
     }
+
+    /**
+     * 获取 站点名称
+     * @return siteNameNotList
+     */
+    public List<String> getSiteNameNotList(){
+        return this.siteNameNotList;
+    }
+
+    /**
+     * 设置 站点名称
+     * @param siteNameNotList
+     */
+    public void setSiteNameNotList(List<String> siteNameNotList){
+        this.siteNameNotList = siteNameNotList;
+    }
+
     /**
      * 获取 开始 事项ID
      * @return matterIdStart
@@ -314,6 +422,23 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
         this.matterIdList = matterIdList;
     }
 
+    /**
+     * 获取 事项ID
+     * @return matterIdNotList
+     */
+    public List<Long> getMatterIdNotList(){
+        return this.matterIdNotList;
+    }
+
+    /**
+     * 设置 事项ID
+     * @param matterIdNotList
+     */
+    public void setMatterIdNotList(List<Long> matterIdNotList){
+        this.matterIdNotList = matterIdNotList;
+    }
+
+
     /**
      * 获取 事项名称
      * @return matterNameList
@@ -329,6 +454,23 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
     public void setMatterNameList(List<String> matterNameList){
         this.matterNameList = matterNameList;
     }
+
+    /**
+     * 获取 事项名称
+     * @return matterNameNotList
+     */
+    public List<String> getMatterNameNotList(){
+        return this.matterNameNotList;
+    }
+
+    /**
+     * 设置 事项名称
+     * @param matterNameNotList
+     */
+    public void setMatterNameNotList(List<String> matterNameNotList){
+        this.matterNameNotList = matterNameNotList;
+    }
+
     /**
      * 获取 事项编码
      * @return matterCodeList
@@ -344,6 +486,23 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
     public void setMatterCodeList(List<String> matterCodeList){
         this.matterCodeList = matterCodeList;
     }
+
+    /**
+     * 获取 事项编码
+     * @return matterCodeNotList
+     */
+    public List<String> getMatterCodeNotList(){
+        return this.matterCodeNotList;
+    }
+
+    /**
+     * 设置 事项编码
+     * @param matterCodeNotList
+     */
+    public void setMatterCodeNotList(List<String> matterCodeNotList){
+        this.matterCodeNotList = matterCodeNotList;
+    }
+
     /**
      * 获取 服务类型（1.公共服务，2.个人服务，3.法人服务）
      * @return userTypeList
@@ -359,6 +518,23 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
     public void setUserTypeList(List<String> userTypeList){
         this.userTypeList = userTypeList;
     }
+
+    /**
+     * 获取 服务类型（1.公共服务，2.个人服务，3.法人服务）
+     * @return userTypeNotList
+     */
+    public List<String> getUserTypeNotList(){
+        return this.userTypeNotList;
+    }
+
+    /**
+     * 设置 服务类型（1.公共服务，2.个人服务，3.法人服务）
+     * @param userTypeNotList
+     */
+    public void setUserTypeNotList(List<String> userTypeNotList){
+        this.userTypeNotList = userTypeNotList;
+    }
+
     /**
      * 获取 主题编码
      * @return themeCodeList
@@ -374,6 +550,23 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
     public void setThemeCodeList(List<String> themeCodeList){
         this.themeCodeList = themeCodeList;
     }
+
+    /**
+     * 获取 主题编码
+     * @return themeCodeNotList
+     */
+    public List<String> getThemeCodeNotList(){
+        return this.themeCodeNotList;
+    }
+
+    /**
+     * 设置 主题编码
+     * @param themeCodeNotList
+     */
+    public void setThemeCodeNotList(List<String> themeCodeNotList){
+        this.themeCodeNotList = themeCodeNotList;
+    }
+
     /**
      * 获取 主题名称
      * @return themeNameList
@@ -389,6 +582,23 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
     public void setThemeNameList(List<String> themeNameList){
         this.themeNameList = themeNameList;
     }
+
+    /**
+     * 获取 主题名称
+     * @return themeNameNotList
+     */
+    public List<String> getThemeNameNotList(){
+        return this.themeNameNotList;
+    }
+
+    /**
+     * 设置 主题名称
+     * @param themeNameNotList
+     */
+    public void setThemeNameNotList(List<String> themeNameNotList){
+        this.themeNameNotList = themeNameNotList;
+    }
+
     /**
      * 获取 开始 事项来源
      * @return sourceStart
@@ -453,6 +663,23 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
         this.sourceList = sourceList;
     }
 
+    /**
+     * 获取 事项来源
+     * @return sourceNotList
+     */
+    public List<Integer> getSourceNotList(){
+        return this.sourceNotList;
+    }
+
+    /**
+     * 设置 事项来源
+     * @param sourceNotList
+     */
+    public void setSourceNotList(List<Integer> sourceNotList){
+        this.sourceNotList = sourceNotList;
+    }
+
+
     /**
      * 获取 开始 创建时间
      * @return createTimeStart
@@ -549,6 +776,23 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
         this.createUserIdList = createUserIdList;
     }
 
+    /**
+     * 获取 创建用户
+     * @return createUserIdNotList
+     */
+    public List<Long> getCreateUserIdNotList(){
+        return this.createUserIdNotList;
+    }
+
+    /**
+     * 设置 创建用户
+     * @param createUserIdNotList
+     */
+    public void setCreateUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+    }
+
+
     /**
      * 获取 开始 修改时间
      * @return updateTimeStart
@@ -581,6 +825,168 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+     * 获取 开始 热门(0.否,1.是)
+     * @return hotStart
+     */
+    public Integer getHotStart(){
+        return this.hotStart;
+    }
+
+    /**
+     * 设置 开始 热门(0.否,1.是)
+     * @param hotStart
+     */
+    public void setHotStart(Integer hotStart){
+        this.hotStart = hotStart;
+    }
+
+    /**
+     * 获取 结束 热门(0.否,1.是)
+     * @return $hotEnd
+     */
+    public Integer getHotEnd(){
+        return this.hotEnd;
+    }
+
+    /**
+     * 设置 结束 热门(0.否,1.是)
+     * @param hotEnd
+     */
+    public void setHotEnd(Integer hotEnd){
+        this.hotEnd = hotEnd;
+    }
+
+    /**
+     * 获取 增加 热门(0.否,1.是)
+     * @return hotIncrement
+     */
+    public Integer getHotIncrement(){
+        return this.hotIncrement;
+    }
+
+    /**
+     * 设置 增加 热门(0.否,1.是)
+     * @param hotIncrement
+     */
+    public void setHotIncrement(Integer hotIncrement){
+        this.hotIncrement = hotIncrement;
+    }
+
+    /**
+     * 获取 热门(0.否,1.是)
+     * @return hotList
+     */
+    public List<Integer> getHotList(){
+        return this.hotList;
+    }
+
+    /**
+     * 设置 热门(0.否,1.是)
+     * @param hotList
+     */
+    public void setHotList(List<Integer> hotList){
+        this.hotList = hotList;
+    }
+
+    /**
+     * 获取 热门(0.否,1.是)
+     * @return hotNotList
+     */
+    public List<Integer> getHotNotList(){
+        return this.hotNotList;
+    }
+
+    /**
+     * 设置 热门(0.否,1.是)
+     * @param hotNotList
+     */
+    public void setHotNotList(List<Integer> hotNotList){
+        this.hotNotList = hotNotList;
+    }
+
+
+    /**
+     * 获取 开始 显示(0.否,1.是)
+     * @return displayStart
+     */
+    public Integer getDisplayStart(){
+        return this.displayStart;
+    }
+
+    /**
+     * 设置 开始 显示(0.否,1.是)
+     * @param displayStart
+     */
+    public void setDisplayStart(Integer displayStart){
+        this.displayStart = displayStart;
+    }
+
+    /**
+     * 获取 结束 显示(0.否,1.是)
+     * @return $displayEnd
+     */
+    public Integer getDisplayEnd(){
+        return this.displayEnd;
+    }
+
+    /**
+     * 设置 结束 显示(0.否,1.是)
+     * @param displayEnd
+     */
+    public void setDisplayEnd(Integer displayEnd){
+        this.displayEnd = displayEnd;
+    }
+
+    /**
+     * 获取 增加 显示(0.否,1.是)
+     * @return displayIncrement
+     */
+    public Integer getDisplayIncrement(){
+        return this.displayIncrement;
+    }
+
+    /**
+     * 设置 增加 显示(0.否,1.是)
+     * @param displayIncrement
+     */
+    public void setDisplayIncrement(Integer displayIncrement){
+        this.displayIncrement = displayIncrement;
+    }
+
+    /**
+     * 获取 显示(0.否,1.是)
+     * @return displayList
+     */
+    public List<Integer> getDisplayList(){
+        return this.displayList;
+    }
+
+    /**
+     * 设置 显示(0.否,1.是)
+     * @param displayList
+     */
+    public void setDisplayList(List<Integer> displayList){
+        this.displayList = displayList;
+    }
+
+    /**
+     * 获取 显示(0.否,1.是)
+     * @return displayNotList
+     */
+    public List<Integer> getDisplayNotList(){
+        return this.displayNotList;
+    }
+
+    /**
+     * 设置 显示(0.否,1.是)
+     * @param displayNotList
+     */
+    public void setDisplayNotList(List<Integer> displayNotList){
+        this.displayNotList = displayNotList;
+    }
+
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -626,6 +1032,15 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
         return this;
     }
 
+    /**
+     * 设置 序号，主键，自增长
+     * @param idNotList
+     */
+    public SiteThemeMatterQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+    }
+
     /**
      * 设置  站点ID
      * @param siteId
@@ -671,6 +1086,15 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
         return this;
     }
 
+    /**
+     * 设置 站点ID
+     * @param siteIdNotList
+     */
+    public SiteThemeMatterQuery siteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+        return this;
+    }
+
 
     /**
      * 设置 站点名称
@@ -735,6 +1159,15 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
         return this;
     }
 
+    /**
+     * 设置 事项ID
+     * @param matterIdNotList
+     */
+    public SiteThemeMatterQuery matterIdNotList(List<Long> matterIdNotList){
+        this.matterIdNotList = matterIdNotList;
+        return this;
+    }
+
 
     /**
      * 设置 事项名称
@@ -875,6 +1308,15 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
         return this;
     }
 
+    /**
+     * 设置 事项来源
+     * @param sourceNotList
+     */
+    public SiteThemeMatterQuery sourceNotList(List<Integer> sourceNotList){
+        this.sourceNotList = sourceNotList;
+        return this;
+    }
+
 
     /**
      * 设置  创建用户
@@ -921,6 +1363,123 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
         return this;
     }
 
+    /**
+     * 设置 创建用户
+     * @param createUserIdNotList
+     */
+    public SiteThemeMatterQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+    }
+
+
+    /**
+     * 设置  热门(0.否,1.是)
+     * @param hot
+     */
+    public SiteThemeMatterQuery hot(Integer hot){
+        setHot(hot);
+        return this;
+    }
+
+    /**
+     * 设置 开始 热门(0.否,1.是)
+     * @param hotStart
+     */
+    public SiteThemeMatterQuery hotStart(Integer hotStart){
+        this.hotStart = hotStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 热门(0.否,1.是)
+     * @param hotEnd
+     */
+    public SiteThemeMatterQuery hotEnd(Integer hotEnd){
+        this.hotEnd = hotEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 热门(0.否,1.是)
+     * @param hotIncrement
+     */
+    public SiteThemeMatterQuery hotIncrement(Integer hotIncrement){
+        this.hotIncrement = hotIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 热门(0.否,1.是)
+     * @param hotList
+     */
+    public SiteThemeMatterQuery hotList(List<Integer> hotList){
+        this.hotList = hotList;
+        return this;
+    }
+
+    /**
+     * 设置 热门(0.否,1.是)
+     * @param hotNotList
+     */
+    public SiteThemeMatterQuery hotNotList(List<Integer> hotNotList){
+        this.hotNotList = hotNotList;
+        return this;
+    }
+
+    /**
+     * 设置  显示(0.否,1.是)
+     * @param display
+     */
+    public SiteThemeMatterQuery display(Integer display){
+        setDisplay(display);
+        return this;
+    }
+
+    /**
+     * 设置 开始 显示(0.否,1.是)
+     * @param displayStart
+     */
+    public SiteThemeMatterQuery displayStart(Integer displayStart){
+        this.displayStart = displayStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 显示(0.否,1.是)
+     * @param displayEnd
+     */
+    public SiteThemeMatterQuery displayEnd(Integer displayEnd){
+        this.displayEnd = displayEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 显示(0.否,1.是)
+     * @param displayIncrement
+     */
+    public SiteThemeMatterQuery displayIncrement(Integer displayIncrement){
+        this.displayIncrement = displayIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 显示(0.否,1.是)
+     * @param displayList
+     */
+    public SiteThemeMatterQuery displayList(List<Integer> displayList){
+        this.displayList = displayList;
+        return this;
+    }
+
+    /**
+     * 设置 显示(0.否,1.是)
+     * @param displayNotList
+     */
+    public SiteThemeMatterQuery displayNotList(List<Integer> displayNotList){
+        this.displayNotList = displayNotList;
+        return this;
+    }
 
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)

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.common.Rest;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.business.model.BusinessEntity;
+import com.mortals.xhx.module.site.model.SiteHallEntity;
+import com.mortals.xhx.module.site.dao.SiteHallDao;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * SiteHallService
+ * <p>
+ * 站点大厅信息 service接口
+ *
+ * @author zxfei
+ * @date 2023-04-25
+ */
+public interface SiteHallService extends ICRUDService<SiteHallEntity, Long> {
+
+    SiteHallDao getDao();
+
+
+    Rest<List<BusinessEntity>> getBusinessByHall(SiteHallEntity siteHall, Context context);
+}
\ No newline at end of file

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

@@ -6,7 +6,9 @@ import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
+import com.mortals.framework.utils.PageUtils;
 import com.mortals.xhx.common.code.IsBusinessEnum;
+import com.mortals.xhx.common.utils.MemoryPagination;
 import com.mortals.xhx.module.business.model.BusinessEntity;
 import com.mortals.xhx.module.business.model.BusinessMatterEntity;
 import com.mortals.xhx.module.business.model.BusinessMatterQuery;
@@ -53,6 +55,10 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
      */
     @Override
     protected SiteBusinessEntity findBefore(SiteBusinessEntity params, PageInfo pageInfo, Context context) throws AppException {
+        //查询所有
+        pageInfo.setCurrPage(1);
+        pageInfo.setPrePageResult(-1);
+
         if (!ObjectUtils.isEmpty(params.getIdNotList())) {
             Set<Long> notIdSet = params.getIdNotList().stream().collect(Collectors.toSet());
             //排除掉了父级，但是子集存在，需要吧父id排除到notlist外
@@ -85,6 +91,8 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
 
     @Override
     protected void findAfter(SiteBusinessEntity params, PageInfo pageInfo, Context context, List<SiteBusinessEntity> list) throws AppException {
+        //重新内存分页
+        list = MemoryPagination.pagination(list, params.getSize() == -1 ? list.size() : params.getSize(), params.getPage());
         if (!ObjectUtils.isEmpty(params.getIdNotList())) {
             //排除掉已经存在的ids
             log.info("idNotList:{}", JSON.toJSONString(params.getIdNotList()));
@@ -172,19 +180,19 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
                     SiteBusinessEntity siteBusinessEntity = this.get(item);
                     return this.find(new SiteBusinessQuery().parentId(siteBusinessEntity.getId())).stream();
                 }).collect(Collectors.toList());
-        log.info("delete childs list：{}",JSON.toJSONString(childs));
-        Long[] childIds = childs.stream().map(item->item.getId()).toArray(Long[]::new);
+        log.info("delete childs list：{}", JSON.toJSONString(childs));
+        Long[] childIds = childs.stream().map(item -> item.getId()).toArray(Long[]::new);
         this.getDao().delete(childIds);
-        Long[] bussinessIds = childs.stream().map(item->item.getBusinessId()).toArray(Long[]::new);
-        log.info("childBussinessIds:{}",JSON.toJSONString(bussinessIds));
-        if(!ObjectUtils.isEmpty(bussinessIds)){
-            businessService.remove(bussinessIds,context);
+        Long[] bussinessIds = childs.stream().map(item -> item.getBusinessId()).toArray(Long[]::new);
+        log.info("childBussinessIds:{}", JSON.toJSONString(bussinessIds));
+        if (!ObjectUtils.isEmpty(bussinessIds)) {
+            businessService.remove(bussinessIds, context);
         }
 
         Long[] mainIds = this.get(ids, context).stream().map(item -> item.getBusinessId()).toArray(Long[]::new);
-        if(!ObjectUtils.isEmpty(mainIds)){
+        if (!ObjectUtils.isEmpty(mainIds)) {
             //删除
-            businessService.remove(mainIds,context);
+            businessService.remove(mainIds, context);
         }
     }
 

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

+package com.mortals.xhx.module.site.service.impl;
+
+import com.mortals.framework.common.Rest;
+import com.mortals.xhx.module.business.model.BusinessEntity;
+import com.mortals.xhx.module.business.model.BusinessQuery;
+import com.mortals.xhx.module.business.service.BusinessService;
+import com.mortals.xhx.module.site.model.SiteBusinessQuery;
+import com.mortals.xhx.module.site.service.SiteBusinessService;
+import com.mortals.xhx.module.window.model.WindowBusinessQuery;
+import com.mortals.xhx.module.window.model.WindowHallEntity;
+import com.mortals.xhx.module.window.model.WindowHallQuery;
+import com.mortals.xhx.module.window.service.WindowBusinessService;
+import com.mortals.xhx.module.window.service.WindowHallService;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+import org.springframework.util.ObjectUtils;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * SiteHallService
+ * 站点大厅信息 service实现
+ *
+ * @author zxfei
+ * @date 2023-04-25
+ */
+@Service("siteHallService")
+public class SiteHallServiceImpl extends AbstractCRUDServiceImpl<SiteHallDao, SiteHallEntity, Long> implements SiteHallService {
+
+    @Autowired
+    private WindowHallService windowHallService;
+    @Autowired
+    private WindowBusinessService windowBusinessService;
+    @Autowired
+    private SiteBusinessService siteBusinessService;
+    @Autowired
+    private BusinessService businessService;
+
+
+    /**
+     * @param entity
+     * @param context
+     * @throws AppException
+     */
+    @Override
+    protected void updateAfter(SiteHallEntity entity, Context context) throws AppException {
+        super.updateAfter(entity, context);
+        WindowHallEntity condition = new WindowHallEntity();
+        condition.setHallId(entity.getId());
+        WindowHallEntity windowHallEntity = new WindowHallEntity();
+        windowHallEntity.setHallName(entity.getHallName());
+        windowHallService.getDao().update(windowHallEntity, condition);
+    }
+
+    /**
+     * @param siteHall
+     * @param context
+     * @return
+     */
+    @Override
+    public Rest<List<BusinessEntity>> getBusinessByHall(SiteHallEntity siteHall, Context context) {
+        if (ObjectUtils.isEmpty(siteHall.getId())) {
+            return Rest.fail("大厅ID不能为空！");
+        }
+        List<Long> windowIds = windowHallService.find(new WindowHallQuery().hallId(siteHall.getId())).parallelStream().map(i -> i.getWindowId()).distinct().collect(Collectors.toList());
+        if (ObjectUtils.isEmpty(windowIds)) {
+            return Rest.fail("窗口list不能为空！");
+        }
+        WindowBusinessQuery windowBusinessQuery = new WindowBusinessQuery();
+        windowBusinessQuery.setWindowIdList(windowIds);
+        List<Long> siteBusinessIdList = windowBusinessService.find(windowBusinessQuery).parallelStream().map(i -> i.getSiteBusinessId()).distinct().collect(Collectors.toList());
+        if (ObjectUtils.isEmpty(siteBusinessIdList)) {
+            return Rest.fail("站点业务list不能为空！");
+        }
+        SiteBusinessQuery siteBusinessQuery = new SiteBusinessQuery();
+        siteBusinessQuery.setIdList(siteBusinessIdList);
+        List<Long> businessIdList = siteBusinessService.find(siteBusinessQuery).parallelStream().map(i -> i.getBusinessId()).distinct().collect(Collectors.toList());
+        if (ObjectUtils.isEmpty(businessIdList)) {
+            return Rest.fail("业务list不能为空！");
+        }
+        BusinessQuery businessQuery = new BusinessQuery();
+        businessQuery.setIdList(businessIdList);
+        List<BusinessEntity> businessEntities = businessService.find(businessQuery);
+        return Rest.ok(businessEntities);
+    }
+}
\ No newline at end of file

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

@@ -6,6 +6,10 @@ import com.mortals.framework.model.PageInfo;
 import com.mortals.xhx.module.matter.model.MatterEntity;
 import com.mortals.xhx.module.matter.model.MatterQuery;
 import com.mortals.xhx.module.matter.service.MatterService;
+import com.mortals.xhx.module.site.model.SiteThemeMatterEntity;
+import com.mortals.xhx.module.site.model.SiteThemeMatterQuery;
+import com.mortals.xhx.module.site.service.SiteThemeMatterService;
+import com.mortals.xhx.module.site.service.SiteThemeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
@@ -31,6 +35,8 @@ public class SiteMatterServiceImpl extends AbstractCRUDServiceImpl<SiteMatterDao
 
     @Autowired
     private MatterService matterService;
+    @Autowired
+    private SiteThemeMatterService siteThemeMatterService;
 
     @Override
     protected void findAfter(SiteMatterEntity params, PageInfo pageInfo, Context context, List<SiteMatterEntity> list) throws AppException {
@@ -69,6 +75,28 @@ public class SiteMatterServiceImpl extends AbstractCRUDServiceImpl<SiteMatterDao
                 matterService.update(matterEntity, context);
             }
         }
+
+        SiteThemeMatterEntity siteThemeMatterEntity = siteThemeMatterService.selectOne(new SiteThemeMatterQuery().matterId(entity.getMatterId()));
+        if (!ObjectUtils.isEmpty(siteThemeMatterEntity)) {
+            siteThemeMatterEntity.setHot(entity.getHot());
+            siteThemeMatterEntity.setDisplay(entity.getDisplay());
+        }
+
+    }
+
+    /**
+     * @param entity
+     * @param context
+     * @throws AppException
+     */
+    @Override
+    protected void saveBefore(SiteMatterEntity entity, Context context) throws AppException {
+        super.saveBefore(entity, context);
+        SiteThemeMatterEntity siteThemeMatterEntity = siteThemeMatterService.selectOne(new SiteThemeMatterQuery().matterId(entity.getMatterId()));
+        if (!ObjectUtils.isEmpty(siteThemeMatterEntity)) {
+            siteThemeMatterEntity.setHot(entity.getHot());
+            siteThemeMatterEntity.setDisplay(entity.getDisplay());
+        }
     }
 
     @Override

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

@@ -405,7 +405,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         pageInfo.setPrePageResult(10);
 
 
-
         return siteEntities;
     }
 
@@ -480,7 +479,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
             if (!ObjectUtils.isEmpty(siteEntities)) {
                 siteAreaVo.setSiteList(siteEntities);
                 //map.put(child.getName(), siteEntities);
-            }else{
+            } else {
                 //没有站点
                 siteAreaVo.setSiteList(Collections.EMPTY_LIST);
             }
@@ -509,7 +508,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         for (AreaEntity areaEntity : areaEntities) {
             List<SiteEntity> siteEntityList = this.find(new SiteQuery().areaCode(areaEntity.getAreaCode()));
 
-            if(!ObjectUtils.isEmpty(siteEntityList)){
+            if (!ObjectUtils.isEmpty(siteEntityList)) {
                 list.addAll(siteEntityList);
             }
         }
@@ -628,6 +627,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         //String dxType = AreaLevelDxTypeEnum.getByValue(areaEntity == null ? 2 : areaEntity.getAreaLevel()).getDesc();
         // String dxType="2";
         //String dxType = "3";
+        log.info("抓取事项开始");
         List<MatterEntity> govMatterList = new ArrayList<>();
         List<DeptEntity> deptEntities = deptService.find(new DeptQuery().siteId(siteEntity.getId()).source(0));
         for (DeptEntity deptEntity : deptEntities) {
@@ -643,6 +643,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
                 govMatterList.addAll(deptMatterList);
             }
         }
+        log.info("抓取事项结束");
      /*   HashMap<String, String> params = new HashMap<>();
         params.put("dxType", dxType);
         params.put("areaCode", siteEntity.getAreaCode());
@@ -666,11 +667,40 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         List<MatterEntity> mattersTwo = this.getMatters(params, context);
         govMatterList.addAll(mattersTwo);*/
 
-        List<MatterEntity> localMatterList = matterService.find(new MatterQuery().areaCode(siteEntity.getAreaCode()));
-        List<MatterEntity> subList = this.subList(govMatterList, localMatterList);
+        // new MatterQuery().setMatterNoNotList();
+
+       // List<MatterEntity> localMatterList = matterService.find(new MatterQuery().areaCode(siteEntity.getAreaCode()));
+
+        //HashSet<String> matterNoSet = new HashSet<>();
+
+
+        Set<String> matterNoSet = matterService.getDao().getMatterListByAreaCode(new MatterQuery().areaCode(siteEntity.getAreaCode())).parallelStream().map(i->i.getMatterNo()).collect(Collectors.toSet());
+
+       /* Integer page = 1;
+        Integer size = 200;
+        PageInfo pageInfo = new PageInfo();
+        pageInfo.setCountPage(false);
+        while (true) {
+            pageInfo.setCurrPage(page);
+            pageInfo.setPrePageResult(size);
+            Result<MatterEntity> matterEntityResult = matterService.find(new MatterQuery().areaCode(siteEntity.getAreaCode()), pageInfo, context);
+            if (ObjectUtils.isEmpty(matterEntityResult.getList())) {
+                break;
+            }
+            Set<String> collect = matterEntityResult.getList().parallelStream().map(i -> i.getMatterNo()).collect(Collectors.toSet());
+            matterNoSet.addAll(collect);
+            page++;
+            log.info("page:{},size:{}", page, collect.size());
+        }*/
+
+
+        log.info("计算差集");
+        // List<MatterEntity> subList = this.subList(govMatterList, localMatterList);
+        List<MatterEntity> subList = this.subListSet(govMatterList, matterNoSet);
+
         log.info("抓取事项总数：{}需要添加事项数量：{}", govMatterList.size(), subList.size());
         subList = subList.stream().distinct().collect(Collectors.toList());
-        log.info("需要添加事项过滤后数量：{}" , subList.size());
+        log.info("需要添加事项过滤后数量：{}", subList.size());
         //差集进行插入并更新详细数据
         if (!ObjectUtils.isEmpty(subList)) {
             for (MatterEntity matterEntity : subList) {
@@ -736,5 +766,10 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         return firstList.parallelStream().filter(item -> !secondSet.contains(item.getMatterNo())).collect(Collectors.toList());
     }
 
+    public List<MatterEntity> subListSet(List<MatterEntity> firstList, Set<String> secondSet) {
+        // Set<String> secondSet = secondList.parallelStream().map(e -> e.getMatterNo()).collect(Collectors.toSet());
+        return firstList.parallelStream().filter(item -> !secondSet.contains(item.getMatterNo())).collect(Collectors.toList());
+    }
+
 
 }
\ No newline at end of file

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

@@ -39,7 +39,6 @@ public class SiteBusinessController extends BaseCRUDJsonBodyMappingController<Si
     private ParamService paramService;
 
     public SiteBusinessController() {
-        super.setFormClass(SiteBusinessForm.class);
         super.setModuleDesc("站点事项");
     }
 
@@ -58,11 +57,11 @@ public class SiteBusinessController extends BaseCRUDJsonBodyMappingController<Si
 
 
     @PostMapping("list/exclude")
-    public String excludeList(SiteBusinessForm form) {
+    public String excludeList(SiteBusinessEntity query) {
         Map<String, Object> model = new HashMap<>();
         JSONObject ret = new JSONObject();
         String busiDesc = "查询" + this.getModuleDesc();
-        Long id = form.getId()[0];
+        Long id = query.getId();
         int code = VALUE_RESULT_SUCCESS;
         try {
             List<SiteBusinessEntity> collect = this.service.find(new SiteBusinessQuery()).stream().map(item -> {
@@ -107,7 +106,6 @@ public class SiteBusinessController extends BaseCRUDJsonBodyMappingController<Si
     }
 
 
-
     /**
      * 查询站点业务扁平结构
      */

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

-package com.mortals.xhx.module.site.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.site.model.SiteBusinessEntity;
-import com.mortals.xhx.module.site.model.SiteBusinessQuery;
-
-/**
-* SiteBusiness
-*
-* 站点事项 Form
-*
-* @author zxfei
-* @date 2022-01-13
-*/
-public class SiteBusinessForm extends BaseCRUDFormLong<SiteBusinessEntity> {
-    private SiteBusinessEntity entity = new SiteBusinessEntity();
-    private SiteBusinessQuery query = new SiteBusinessQuery();
-    public SiteBusinessForm(){
-    }
-
-    @Override
-    public SiteBusinessEntity getEntity() {
-        return entity;
-    }
-
-    public void setSiteBusiness(SiteBusinessEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public SiteBusinessQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(SiteBusinessQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

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

@@ -70,7 +70,6 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
     private AreaService areaService;
 
     public SiteController() {
-        super.setFormClass(SiteForm.class);
         super.setModuleDesc("站点");
     }
 

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

-package com.mortals.xhx.module.site.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.site.model.SiteEntity;
-import com.mortals.xhx.module.site.model.SiteQuery;
-
-/**
-* Site
-*
-* 站点 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class SiteForm extends BaseCRUDFormLong<SiteEntity> {
-    private SiteEntity entity = new SiteEntity();
-    private SiteQuery query = new SiteQuery();
-    public SiteForm(){
-    }
-
-    @Override
-    public SiteEntity getEntity() {
-        return entity;
-    }
-
-    public void setSite(SiteEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public SiteQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(SiteQuery query) {
-        this.query = query;
-    }
-}
\ 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.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.business.model.BusinessEntity;
+import com.mortals.xhx.module.site.model.*;
+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.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);
+    }
+
+
+    /**
+     * 根据大厅查询所属业务
+     */
+    @PostMapping(value = "getBusinessByHall")
+    @UnAuth
+    public Rest<Object> getBusinessByHall(@RequestBody SiteHallEntity siteHall) {
+        Rest<Object> ret = new Rest();
+        Map<String, Object> model = new HashMap();
+        String busiDesc = "根据大厅查询所属业务";
+        int code = VALUE_RESULT_SUCCESS;
+        try {
+            Rest<List<BusinessEntity>> rest = this.service.getBusinessByHall(siteHall, getContext());
+            recordSysLog(request, busiDesc + " 【成功】");
+            model.put(KEY_RESULT_DATA, rest.getData());
+            model.put("message_info", busiDesc + "成功");
+        } catch (Exception e) {
+            log.error("获取异常", e);
+            code = VALUE_RESULT_FAILURE;
+            this.doException(this.request, busiDesc, model, e);
+        }
+        ret.setCode(code);
+        ret.setData(model);
+        ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+        return ret;
+    }
+
+
+}
\ No newline at end of file

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

@@ -29,7 +29,6 @@ public class SiteMatterController extends BaseCRUDJsonBodyMappingController<Site
     private ParamService paramService;
 
     public SiteMatterController() {
-        super.setFormClass(SiteMatterForm.class);
         super.setModuleDesc("站点事项");
     }
 

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

-package com.mortals.xhx.module.site.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.site.model.SiteMatterEntity;
-import com.mortals.xhx.module.site.model.SiteMatterQuery;
-
-/**
-* SiteMatter
-*
-* 站点事项 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class SiteMatterForm extends BaseCRUDFormLong<SiteMatterEntity> {
-    private SiteMatterEntity entity = new SiteMatterEntity();
-    private SiteMatterQuery query = new SiteMatterQuery();
-    public SiteMatterForm(){
-    }
-
-    @Override
-    public SiteMatterEntity getEntity() {
-        return entity;
-    }
-
-    public void setSiteMatter(SiteMatterEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public SiteMatterQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(SiteMatterQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

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

@@ -23,7 +23,6 @@ public class SiteModelController extends BaseCRUDJsonBodyMappingController<SiteM
     private ParamService paramService;
 
     public SiteModelController() {
-        super.setFormClass(SiteModelForm.class);
         super.setModuleDesc("站点模块");
     }
 }
\ No newline at end of file

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

-package com.mortals.xhx.module.site.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.site.model.SiteModelEntity;
-import com.mortals.xhx.module.site.model.SiteModelQuery;
-
-/**
-* SiteModel
-*
-* 站点模块 Form
-*
-* @author zxfei
-* @date 2022-01-10
-*/
-public class SiteModelForm extends BaseCRUDFormLong<SiteModelEntity> {
-    private SiteModelEntity entity = new SiteModelEntity();
-    private SiteModelQuery query = new SiteModelQuery();
-    public SiteModelForm(){
-    }
-
-    @Override
-    public SiteModelEntity getEntity() {
-        return entity;
-    }
-
-    public void setSiteModel(SiteModelEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public SiteModelQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(SiteModelQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinBaseController.java

@@ -57,7 +57,6 @@ public class SkinBaseController extends BaseCRUDJsonBodyMappingController<SkinBa
     private SkinFieldService skinFieldService;
 
     public SkinBaseController(){
-        super.setFormClass(SkinBaseForm.class);
         super.setModuleDesc( "系统基础皮肤");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinBaseForm.java

-package com.mortals.xhx.module.skin.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.skin.model.SkinBaseEntity;
-import com.mortals.xhx.module.skin.model.SkinBaseQuery;
-
-/**
-* SkinBase
-*
-* 系统基础皮肤 Form
-*
-* @author zxfei
-* @date 2022-05-24
-*/
-public class SkinBaseForm extends BaseCRUDFormLong<SkinBaseEntity> {
-    private SkinBaseEntity entity = new SkinBaseEntity();
-    private SkinBaseQuery query = new SkinBaseQuery();
-    public SkinBaseForm(){
-    }
-
-    @Override
-    public SkinBaseEntity getEntity() {
-        return entity;
-    }
-
-    public void setSkinBase(SkinBaseEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public SkinBaseQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(SkinBaseQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinCategoryController.java

@@ -38,7 +38,6 @@ public class SkinCategoryController extends BaseCRUDJsonBodyMappingController<Sk
     private ParamService paramService;
 
     public SkinCategoryController(){
-        super.setFormClass(SkinCategoryForm.class);
         super.setModuleDesc( "系统皮肤分类");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinCategoryForm.java

-package com.mortals.xhx.module.skin.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.skin.model.SkinCategoryEntity;
-import com.mortals.xhx.module.skin.model.SkinCategoryQuery;
-
-/**
-* SkinCategory
-*
-* 系统皮肤分类 Form
-*
-* @author zxfei
-* @date 2022-05-24
-*/
-public class SkinCategoryForm extends BaseCRUDFormLong<SkinCategoryEntity> {
-    private SkinCategoryEntity entity = new SkinCategoryEntity();
-    private SkinCategoryQuery query = new SkinCategoryQuery();
-    public SkinCategoryForm(){
-    }
-
-    @Override
-    public SkinCategoryEntity getEntity() {
-        return entity;
-    }
-
-    public void setSkinCategory(SkinCategoryEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public SkinCategoryQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(SkinCategoryQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinFieldController.java

@@ -38,7 +38,6 @@ public class SkinFieldController extends BaseCRUDJsonBodyMappingController<SkinF
     private ParamService paramService;
 
     public SkinFieldController(){
-        super.setFormClass(SkinFieldForm.class);
         super.setModuleDesc( "皮肤属性字段配置");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinFieldForm.java

-package com.mortals.xhx.module.skin.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.skin.model.SkinFieldEntity;
-import com.mortals.xhx.module.skin.model.SkinFieldQuery;
-
-/**
-* SkinField
-*
-* 皮肤属性字段配置 Form
-*
-* @author zxfei
-* @date 2022-05-24
-*/
-public class SkinFieldForm extends BaseCRUDFormLong<SkinFieldEntity> {
-    private SkinFieldEntity entity = new SkinFieldEntity();
-    private SkinFieldQuery query = new SkinFieldQuery();
-    public SkinFieldForm(){
-    }
-
-    @Override
-    public SkinFieldEntity getEntity() {
-        return entity;
-    }
-
-    public void setSkinField(SkinFieldEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public SkinFieldQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(SkinFieldQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinTemplateController.java

@@ -38,7 +38,6 @@ public class SkinTemplateController extends BaseCRUDJsonBodyMappingController<Sk
     private ParamService paramService;
 
     public SkinTemplateController(){
-        super.setFormClass(SkinTemplateForm.class);
         super.setModuleDesc( "系统皮肤模板");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinTemplateForm.java

-package com.mortals.xhx.module.skin.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.skin.model.SkinTemplateEntity;
-import com.mortals.xhx.module.skin.model.SkinTemplateQuery;
-
-/**
-* SkinTemplate
-*
-* 系统皮肤模板 Form
-*
-* @author zxfei
-* @date 2022-05-24
-*/
-public class SkinTemplateForm extends BaseCRUDFormLong<SkinTemplateEntity> {
-    private SkinTemplateEntity entity = new SkinTemplateEntity();
-    private SkinTemplateQuery query = new SkinTemplateQuery();
-    public SkinTemplateForm(){
-    }
-
-    @Override
-    public SkinTemplateEntity getEntity() {
-        return entity;
-    }
-
-    public void setSkinTemplate(SkinTemplateEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public SkinTemplateQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(SkinTemplateQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/sms/web/SmsSetController.java

@@ -26,7 +26,6 @@ public class SmsSetController extends BaseCRUDJsonBodyMappingController<SmsSetSe
     private ParamService paramService;
 
     public SmsSetController() {
-        super.setFormClass(SmsSetForm.class);
         super.setModuleDesc("短信设置");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/sms/web/SmsSetForm.java

-package com.mortals.xhx.module.sms.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.sms.model.SmsSetEntity;
-import com.mortals.xhx.module.sms.model.SmsSetQuery;
-
-/**
-* SmsSet
-*
-* 短信设置 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class SmsSetForm extends BaseCRUDFormLong<SmsSetEntity> {
-    private SmsSetEntity entity = new SmsSetEntity();
-    private SmsSetQuery query = new SmsSetQuery();
-    public SmsSetForm(){
-    }
-
-    @Override
-    public SmsSetEntity getEntity() {
-        return entity;
-    }
-
-    public void setSmsSet(SmsSetEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public SmsSetQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(SmsSetQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/sms/web/SmsTemplateController.java

@@ -26,7 +26,6 @@ public class SmsTemplateController extends BaseCRUDJsonBodyMappingController<Sms
     private ParamService paramService;
 
     public SmsTemplateController() {
-        super.setFormClass(SmsTemplateForm.class);
         super.setModuleDesc("短信模板");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/sms/web/SmsTemplateForm.java

-package com.mortals.xhx.module.sms.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.sms.model.SmsTemplateEntity;
-import com.mortals.xhx.module.sms.model.SmsTemplateQuery;
-
-/**
-* SmsTemplate
-*
-* 短信模板 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class SmsTemplateForm extends BaseCRUDFormLong<SmsTemplateEntity> {
-    private SmsTemplateEntity entity = new SmsTemplateEntity();
-    private SmsTemplateQuery query = new SmsTemplateQuery();
-    public SmsTemplateForm(){
-    }
-
-    @Override
-    public SmsTemplateEntity getEntity() {
-        return entity;
-    }
-
-    public void setSmsTemplate(SmsTemplateEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public SmsTemplateQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(SmsTemplateQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

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

 package com.mortals.xhx.module.window.dao;
 
 import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
+import com.mortals.xhx.module.matter.model.MatterEntity;
 import com.mortals.xhx.module.window.model.WindowEntity;
+
 import java.util.List;
+
 /**
-* 站点部门窗口Dao
-* 站点部门窗口 DAO接口
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public interface  WindowDao extends ICRUDDao<WindowEntity,Long>{
+ * 窗口Dao
+ * 窗口 DAO接口
+ *
+ * @author zxfei
+ * @date 2022-01-12
+ */
+public interface WindowDao extends ICRUDDao<WindowEntity, Long> {
+
+    String SQLID_SUB_HALL_LIST = "getSubHallList";
+    String SQLID_SUB_HALL_COUNT = "getSubHallListCount";
+
+
+    Result<WindowEntity> getSubHallList(WindowEntity windowQuery, PageInfo pageInfo);
+
 
 
 }

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/WindowDaoImpl.java

 package com.mortals.xhx.module.window.dao.ibatis;
 
 
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.ParamDto;
+import com.mortals.framework.model.Result;
+import com.mortals.xhx.module.matter.model.MatterEntity;
+import org.apache.ibatis.session.RowBounds;
 import org.springframework.stereotype.Repository;
 import com.mortals.xhx.module.window.dao.WindowDao;
 import com.mortals.xhx.module.window.model.WindowEntity;
+
+import java.util.ArrayList;
 import java.util.Date;
+
 import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+
 import java.util.List;
+
 /**
-* 站点部门窗口DaoImpl DAO接口
-*
-* @author zxfei
-* @date 2022-01-12
-*/
+ * 站点部门窗口DaoImpl DAO接口
+ *
+ * @author zxfei
+ * @date 2022-01-12
+ */
 @Repository("windowDao")
-public class WindowDaoImpl extends BaseCRUDDaoMybatis<WindowEntity,Long> implements WindowDao {
+public class WindowDaoImpl extends BaseCRUDDaoMybatis<WindowEntity, Long> implements WindowDao {
 
 
+    /**
+     * @param windowQuery
+     * @param pageInfo
+     * @return
+     */
+    @Override
+    public Result<WindowEntity> getSubHallList(WindowEntity windowQuery, PageInfo pageInfo) {
+        Result<WindowEntity> result = new Result();
+        ParamDto paramDto = this.getQueryParam(windowQuery);
+        int count = this.getSubHallListCount(paramDto);
+        List list = null;
+        if (count == 0) {
+            list = new ArrayList();
+        } else if (pageInfo.getPrePageResult() == -1) {
+            list = this.getSqlSession().selectList(this.getSqlId(SQLID_SUB_HALL_LIST), paramDto);
+        } else {
+            RowBounds rowBounds = new RowBounds(pageInfo.getBeginIndex(), pageInfo.getPrePageResult());
+            list = this.getSqlSession().selectList(this.getSqlId(SQLID_SUB_HALL_LIST), this.cpyQueryParamDto(paramDto), rowBounds);
+        }
+        pageInfo.setTotalResult(count);
+        result.setPageInfo(pageInfo);
+        result.setList(list);
+        return result;
+    }
 
+    public int getSubHallListCount(ParamDto paramDto) {
+        return this.getSqlSession().selectOne(this.getSqlId(SQLID_SUB_HALL_COUNT), this.cpyQueryParamDto(paramDto));
+    }
 }

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/WindowEntity.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.WindowVo;
-
+import lombok.Data;
 /**
  * 站点部门窗口实体对象
  *
  * @author zxfei
- * @date 2023-02-21
+ * @date 2023-05-04
  */
-
+@Data
 public class WindowEntity extends WindowVo {
     private static final long serialVersionUID = 1L;
 
@@ -82,305 +80,18 @@ public class WindowEntity extends WindowVo {
      * 楼层
      */
     private Integer level;
-
-
-    public WindowEntity() {
-    }
-
-    /**
-     * 获取 站点ID
-     *
-     * @return Long
-     */
-    public Long getSiteId() {
-        return siteId;
-    }
-
-    /**
-     * 设置 站点ID
-     *
-     * @param siteId
-     */
-    public void setSiteId(Long siteId) {
-        this.siteId = siteId;
-    }
-
-    /**
-     * 获取 站点名称
-     *
-     * @return String
-     */
-    public String getSiteName() {
-        return siteName;
-    }
-
-    /**
-     * 设置 站点名称
-     *
-     * @param siteName
-     */
-    public void setSiteName(String siteName) {
-        this.siteName = siteName;
-    }
-
-    /**
-     * 获取 部门ID
-     *
-     * @return Long
-     */
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    /**
-     * 设置 部门ID
-     *
-     * @param deptId
-     */
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    /**
-     * 获取 部门名称
-     *
-     * @return String
-     */
-    public String getDeptName() {
-        return deptName;
-    }
-
-    /**
-     * 设置 部门名称
-     *
-     * @param deptName
-     */
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-
-    /**
-     * 获取 窗口名称
-     *
-     * @return String
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * 设置 窗口名称
-     *
-     * @param name
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * 获取 英语窗口名
-     *
-     * @return String
-     */
-    public String getEnglishName() {
-        return englishName;
-    }
-
-    /**
-     * 设置 英语窗口名
-     *
-     * @param englishName
-     */
-    public void setEnglishName(String englishName) {
-        this.englishName = englishName;
-    }
-
-    /**
-     * 获取 区域
-     *
-     * @return String
-     */
-    public String getRegion() {
-        return region;
-    }
-
-    /**
-     * 设置 区域
-     *
-     * @param region
-     */
-    public void setRegion(String region) {
-        this.region = region;
-    }
-
-    /**
-     * 获取 英语区域
-     *
-     * @return String
-     */
-    public String getEnglishRegion() {
-        return englishRegion;
-    }
-
-    /**
-     * 设置 英语区域
-     *
-     * @param englishRegion
-     */
-    public void setEnglishRegion(String englishRegion) {
-        this.englishRegion = englishRegion;
-    }
-
-    /**
-     * 获取 窗口编号
-     *
-     * @return String
-     */
-    public String getFromnum() {
-        return fromnum;
-    }
-
-    /**
-     * 设置 窗口编号
-     *
-     * @param fromnum
-     */
-    public void setFromnum(String fromnum) {
-        this.fromnum = fromnum;
-    }
-
     /**
-     * 获取 红旗窗口 (1.是，0.否)
-     *
-     * @return Integer
+     * 名称描述
      */
-    public Integer getHongqi() {
-        return hongqi;
-    }
-
+    private String nameDesc;
     /**
-     * 设置 红旗窗口 (1.是，0.否)
-     *
-     * @param hongqi
-     */
-    public void setHongqi(Integer hongqi) {
-        this.hongqi = hongqi;
-    }
-
-    /**
-     * 获取 无人值守(1.是，)
-     *
-     * @return Integer
+     * 英文名称描述
      */
-    public Integer getDuty() {
-        return duty;
-    }
-
-    /**
-     * 设置 无人值守(1.是，)
-     *
-     * @param duty
-     */
-    public void setDuty(Integer duty) {
-        this.duty = duty;
-    }
-
-    /**
-     * 获取 显示内容
-     *
-     * @return String
-     */
-    public String getDutyContent() {
-        return dutyContent;
-    }
-
-    /**
-     * 设置 显示内容
-     *
-     * @param dutyContent
-     */
-    public void setDutyContent(String dutyContent) {
-        this.dutyContent = dutyContent;
-    }
-
-    /**
-     * 获取 显示英文
-     *
-     * @return String
-     */
-    public String getDutyEnglish() {
-        return dutyEnglish;
-    }
-
-    /**
-     * 设置 显示英文
-     *
-     * @param dutyEnglish
-     */
-    public void setDutyEnglish(String dutyEnglish) {
-        this.dutyEnglish = dutyEnglish;
-    }
-
-    /**
-     * 获取 备注
-     *
-     * @return String
-     */
-    public String getSummary() {
-        return summary;
-    }
-
-    /**
-     * 设置 备注
-     *
-     * @param summary
-     */
-    public void setSummary(String summary) {
-        this.summary = summary;
-    }
-
-    /**
-     * 获取 楼栋
-     *
-     * @return Integer
-     */
-    public Integer getBuilding() {
-        return building;
-    }
-
-    /**
-     * 设置 楼栋
-     *
-     * @param building
-     */
-    public void setBuilding(Integer building) {
-        this.building = building;
-    }
-
-    /**
-     * 获取 楼层
-     *
-     * @return Integer
-     */
-    public Integer getLevel() {
-        return level;
-    }
-
-    /**
-     * 设置 楼层
-     *
-     * @param level
-     */
-    public void setLevel(Integer level) {
-        this.level = level;
-    }
-
-
+    private String englishNameDesc;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
     }
-
     @Override
     public boolean equals(Object obj) {
         if (obj == null) return false;
@@ -393,59 +104,42 @@ public class WindowEntity extends WindowVo {
         return false;
     }
 
-    public String toString() {
-        StringBuilder sb = new StringBuilder("");
-        sb.append(",siteId:").append(getSiteId());
-        sb.append(",siteName:").append(getSiteName());
-        sb.append(",deptId:").append(getDeptId());
-        sb.append(",deptName:").append(getDeptName());
-        sb.append(",name:").append(getName());
-        sb.append(",englishName:").append(getEnglishName());
-        sb.append(",region:").append(getRegion());
-        sb.append(",englishRegion:").append(getEnglishRegion());
-        sb.append(",fromnum:").append(getFromnum());
-        sb.append(",hongqi:").append(getHongqi());
-        sb.append(",duty:").append(getDuty());
-        sb.append(",dutyContent:").append(getDutyContent());
-        sb.append(",dutyEnglish:").append(getDutyEnglish());
-        sb.append(",summary:").append(getSummary());
-        sb.append(",building:").append(getBuilding());
-        sb.append(",level:").append(getLevel());
-        return sb.toString();
-    }
-
-    public void initAttrValue() {
+    public void initAttrValue(){
 
-        this.siteId = 0L;
+        this.siteId = null;
 
-        this.siteName = "";
+        this.siteName = null;
 
         this.deptId = null;
 
-        this.deptName = "";
+        this.deptName = null;
 
-        this.name = "";
+        this.name = null;
 
-        this.englishName = "";
+        this.englishName = null;
 
-        this.region = "";
+        this.region = null;
 
-        this.englishRegion = "";
+        this.englishRegion = null;
 
-        this.fromnum = "";
+        this.fromnum = null;
 
         this.hongqi = 1;
 
-        this.duty = 0;
+        this.duty = null;
 
         this.dutyContent = "";
 
         this.dutyEnglish = "";
 
-        this.summary = "";
+        this.summary = null;
 
         this.building = 1;
 
         this.level = 1;
+
+        this.nameDesc = "";
+
+        this.englishNameDesc = "";
     }
 }
\ No newline at end of file

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/WindowHallQuery.java

+package com.mortals.xhx.module.window.model;
+
+import java.util.List;
+import com.mortals.xhx.module.window.model.WindowHallEntity;
+/**
+* 大厅窗口查询对象
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+public class WindowHallQuery extends WindowHallEntity {
+    /** 开始 序号，主键，自增长 */
+    private Long idStart;
+
+    /** 结束 序号，主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 序号，主键，自增长 */
+    private Long idIncrement;
+
+    /** 序号，主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 序号，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
+    /** 开始 窗口ID */
+    private Long windowIdStart;
+
+    /** 结束 窗口ID */
+    private Long windowIdEnd;
+
+    /** 增加 窗口ID */
+    private Long windowIdIncrement;
+
+    /** 窗口ID列表 */
+    private List <Long> windowIdList;
+
+    /** 窗口ID排除列表 */
+    private List <Long> windowIdNotList;
+
+    /** 窗口名称 */
+    private List<String> windowNameList;
+
+    /** 窗口名称排除列表 */
+    private List <String> windowNameNotList;
+    /** 开始 大厅ID */
+    private Long hallIdStart;
+
+    /** 结束 大厅ID */
+    private Long hallIdEnd;
+
+    /** 增加 大厅ID */
+    private Long hallIdIncrement;
+
+    /** 大厅ID列表 */
+    private List <Long> hallIdList;
+
+    /** 大厅ID排除列表 */
+    private List <Long> hallIdNotList;
+
+    /** 大厅名称 */
+    private List<String> hallNameList;
+
+    /** 大厅名称排除列表 */
+    private List <String> hallNameNotList;
+    /** 开始 排序 */
+    private Integer sortStart;
+
+    /** 结束 排序 */
+    private Integer sortEnd;
+
+    /** 增加 排序 */
+    private Integer sortIncrement;
+
+    /** 排序列表 */
+    private List <Integer> sortList;
+
+    /** 排序排除列表 */
+    private List <Integer> sortNotList;
+
+    /** 备注 */
+    private List<String> remarkList;
+
+    /** 备注排除列表 */
+    private List <String> remarkNotList;
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 创建用户排除列表 */
+    private List <Long> createUserIdNotList;
+
+    /** 开始 修改时间 */
+    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<WindowHallQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<WindowHallQuery> andConditionList;
+
+    public WindowHallQuery(){}
+
+    /**
+    * 获取 开始 序号，主键，自增长
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 序号，主键，自增长
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 序号，主键，自增长
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 序号，主键，自增长
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 序号，主键，自增长
+    * @return idNotList
+    */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idNotList
+    */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
+    /**
+    * 获取 开始 窗口ID
+    * @return windowIdStart
+    */
+    public Long getWindowIdStart(){
+        return this.windowIdStart;
+    }
+
+    /**
+    * 设置 开始 窗口ID
+    * @param windowIdStart
+    */
+    public void setWindowIdStart(Long windowIdStart){
+        this.windowIdStart = windowIdStart;
+    }
+
+    /**
+    * 获取 结束 窗口ID
+    * @return $windowIdEnd
+    */
+    public Long getWindowIdEnd(){
+        return this.windowIdEnd;
+    }
+
+    /**
+    * 设置 结束 窗口ID
+    * @param windowIdEnd
+    */
+    public void setWindowIdEnd(Long windowIdEnd){
+        this.windowIdEnd = windowIdEnd;
+    }
+
+    /**
+    * 获取 增加 窗口ID
+    * @return windowIdIncrement
+    */
+    public Long getWindowIdIncrement(){
+        return this.windowIdIncrement;
+    }
+
+    /**
+    * 设置 增加 窗口ID
+    * @param windowIdIncrement
+    */
+    public void setWindowIdIncrement(Long windowIdIncrement){
+        this.windowIdIncrement = windowIdIncrement;
+    }
+
+    /**
+    * 获取 窗口ID
+    * @return windowIdList
+    */
+    public List<Long> getWindowIdList(){
+        return this.windowIdList;
+    }
+
+    /**
+    * 设置 窗口ID
+    * @param windowIdList
+    */
+    public void setWindowIdList(List<Long> windowIdList){
+        this.windowIdList = windowIdList;
+    }
+
+    /**
+    * 获取 窗口ID
+    * @return windowIdNotList
+    */
+    public List<Long> getWindowIdNotList(){
+        return this.windowIdNotList;
+    }
+
+    /**
+    * 设置 窗口ID
+    * @param windowIdNotList
+    */
+    public void setWindowIdNotList(List<Long> windowIdNotList){
+        this.windowIdNotList = windowIdNotList;
+    }
+
+
+    /**
+    * 获取 窗口名称
+    * @return windowNameList
+    */
+    public List<String> getWindowNameList(){
+        return this.windowNameList;
+    }
+
+    /**
+    * 设置 窗口名称
+    * @param windowNameList
+    */
+    public void setWindowNameList(List<String> windowNameList){
+        this.windowNameList = windowNameList;
+    }
+
+    /**
+    * 获取 窗口名称
+    * @return windowNameNotList
+    */
+    public List<String> getWindowNameNotList(){
+        return this.windowNameNotList;
+    }
+
+    /**
+    * 设置 窗口名称
+    * @param windowNameNotList
+    */
+    public void setWindowNameNotList(List<String> windowNameNotList){
+        this.windowNameNotList = windowNameNotList;
+    }
+
+    /**
+    * 获取 开始 大厅ID
+    * @return hallIdStart
+    */
+    public Long getHallIdStart(){
+        return this.hallIdStart;
+    }
+
+    /**
+    * 设置 开始 大厅ID
+    * @param hallIdStart
+    */
+    public void setHallIdStart(Long hallIdStart){
+        this.hallIdStart = hallIdStart;
+    }
+
+    /**
+    * 获取 结束 大厅ID
+    * @return $hallIdEnd
+    */
+    public Long getHallIdEnd(){
+        return this.hallIdEnd;
+    }
+
+    /**
+    * 设置 结束 大厅ID
+    * @param hallIdEnd
+    */
+    public void setHallIdEnd(Long hallIdEnd){
+        this.hallIdEnd = hallIdEnd;
+    }
+
+    /**
+    * 获取 增加 大厅ID
+    * @return hallIdIncrement
+    */
+    public Long getHallIdIncrement(){
+        return this.hallIdIncrement;
+    }
+
+    /**
+    * 设置 增加 大厅ID
+    * @param hallIdIncrement
+    */
+    public void setHallIdIncrement(Long hallIdIncrement){
+        this.hallIdIncrement = hallIdIncrement;
+    }
+
+    /**
+    * 获取 大厅ID
+    * @return hallIdList
+    */
+    public List<Long> getHallIdList(){
+        return this.hallIdList;
+    }
+
+    /**
+    * 设置 大厅ID
+    * @param hallIdList
+    */
+    public void setHallIdList(List<Long> hallIdList){
+        this.hallIdList = hallIdList;
+    }
+
+    /**
+    * 获取 大厅ID
+    * @return hallIdNotList
+    */
+    public List<Long> getHallIdNotList(){
+        return this.hallIdNotList;
+    }
+
+    /**
+    * 设置 大厅ID
+    * @param hallIdNotList
+    */
+    public void setHallIdNotList(List<Long> hallIdNotList){
+        this.hallIdNotList = hallIdNotList;
+    }
+
+
+    /**
+    * 获取 大厅名称
+    * @return hallNameList
+    */
+    public List<String> getHallNameList(){
+        return this.hallNameList;
+    }
+
+    /**
+    * 设置 大厅名称
+    * @param hallNameList
+    */
+    public void setHallNameList(List<String> hallNameList){
+        this.hallNameList = hallNameList;
+    }
+
+    /**
+    * 获取 大厅名称
+    * @return hallNameNotList
+    */
+    public List<String> getHallNameNotList(){
+        return this.hallNameNotList;
+    }
+
+    /**
+    * 设置 大厅名称
+    * @param hallNameNotList
+    */
+    public void setHallNameNotList(List<String> hallNameNotList){
+        this.hallNameNotList = hallNameNotList;
+    }
+
+    /**
+    * 获取 开始 排序
+    * @return sortStart
+    */
+    public Integer getSortStart(){
+        return this.sortStart;
+    }
+
+    /**
+    * 设置 开始 排序
+    * @param sortStart
+    */
+    public void setSortStart(Integer sortStart){
+        this.sortStart = sortStart;
+    }
+
+    /**
+    * 获取 结束 排序
+    * @return $sortEnd
+    */
+    public Integer getSortEnd(){
+        return this.sortEnd;
+    }
+
+    /**
+    * 设置 结束 排序
+    * @param sortEnd
+    */
+    public void setSortEnd(Integer sortEnd){
+        this.sortEnd = sortEnd;
+    }
+
+    /**
+    * 获取 增加 排序
+    * @return sortIncrement
+    */
+    public Integer getSortIncrement(){
+        return this.sortIncrement;
+    }
+
+    /**
+    * 设置 增加 排序
+    * @param sortIncrement
+    */
+    public void setSortIncrement(Integer sortIncrement){
+        this.sortIncrement = sortIncrement;
+    }
+
+    /**
+    * 获取 排序
+    * @return sortList
+    */
+    public List<Integer> getSortList(){
+        return this.sortList;
+    }
+
+    /**
+    * 设置 排序
+    * @param sortList
+    */
+    public void setSortList(List<Integer> sortList){
+        this.sortList = sortList;
+    }
+
+    /**
+    * 获取 排序
+    * @return sortNotList
+    */
+    public List<Integer> getSortNotList(){
+        return this.sortNotList;
+    }
+
+    /**
+    * 设置 排序
+    * @param sortNotList
+    */
+    public void setSortNotList(List<Integer> sortNotList){
+        this.sortNotList = sortNotList;
+    }
+
+
+    /**
+    * 获取 备注
+    * @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 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 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 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;
+    }
+
+    /**
+    * 设置  序号，主键，自增长
+    * @param id
+    */
+    public WindowHallQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public WindowHallQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public WindowHallQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public WindowHallQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public WindowHallQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+        /**
+        * 设置 序号，主键，自增长
+        * @param idNotList
+        */
+        public WindowHallQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+        }
+
+    /**
+    * 设置  窗口ID
+    * @param windowId
+    */
+    public WindowHallQuery windowId(Long windowId){
+	    setWindowId(windowId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 窗口ID
+    * @param windowIdStart
+    */
+    public WindowHallQuery windowIdStart(Long windowIdStart){
+		this.windowIdStart = windowIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 窗口ID
+    * @param windowIdEnd
+    */
+    public WindowHallQuery windowIdEnd(Long windowIdEnd){
+		this.windowIdEnd = windowIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 窗口ID
+    * @param windowIdIncrement
+    */
+    public WindowHallQuery windowIdIncrement(Long windowIdIncrement){
+		this.windowIdIncrement = windowIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 窗口ID
+    * @param windowIdList
+    */
+    public WindowHallQuery windowIdList(List<Long> windowIdList){
+        this.windowIdList = windowIdList;
+		return this;
+        }
+
+        /**
+        * 设置 窗口ID
+        * @param windowIdNotList
+        */
+        public WindowHallQuery windowIdNotList(List<Long> windowIdNotList){
+        this.windowIdNotList = windowIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 窗口名称
+    * @param windowName
+    */
+    public WindowHallQuery windowName(String windowName){
+        setWindowName(windowName);
+		return this;
+    }
+
+    /**
+    * 设置 窗口名称
+    * @param windowNameList
+    */
+    public WindowHallQuery windowNameList(List<String> windowNameList){
+        this.windowNameList = windowNameList;
+		return this;
+    }
+
+    /**
+    * 设置  大厅ID
+    * @param hallId
+    */
+    public WindowHallQuery hallId(Long hallId){
+	    setHallId(hallId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 大厅ID
+    * @param hallIdStart
+    */
+    public WindowHallQuery hallIdStart(Long hallIdStart){
+		this.hallIdStart = hallIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 大厅ID
+    * @param hallIdEnd
+    */
+    public WindowHallQuery hallIdEnd(Long hallIdEnd){
+		this.hallIdEnd = hallIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 大厅ID
+    * @param hallIdIncrement
+    */
+    public WindowHallQuery hallIdIncrement(Long hallIdIncrement){
+		this.hallIdIncrement = hallIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 大厅ID
+    * @param hallIdList
+    */
+    public WindowHallQuery hallIdList(List<Long> hallIdList){
+        this.hallIdList = hallIdList;
+		return this;
+        }
+
+        /**
+        * 设置 大厅ID
+        * @param hallIdNotList
+        */
+        public WindowHallQuery hallIdNotList(List<Long> hallIdNotList){
+        this.hallIdNotList = hallIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 大厅名称
+    * @param hallName
+    */
+    public WindowHallQuery hallName(String hallName){
+        setHallName(hallName);
+		return this;
+    }
+
+    /**
+    * 设置 大厅名称
+    * @param hallNameList
+    */
+    public WindowHallQuery hallNameList(List<String> hallNameList){
+        this.hallNameList = hallNameList;
+		return this;
+    }
+
+    /**
+    * 设置  排序
+    * @param sort
+    */
+    public WindowHallQuery sort(Integer sort){
+	    setSort(sort);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 排序
+    * @param sortStart
+    */
+    public WindowHallQuery sortStart(Integer sortStart){
+		this.sortStart = sortStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 排序
+    * @param sortEnd
+    */
+    public WindowHallQuery sortEnd(Integer sortEnd){
+		this.sortEnd = sortEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 排序
+    * @param sortIncrement
+    */
+    public WindowHallQuery sortIncrement(Integer sortIncrement){
+		this.sortIncrement = sortIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 排序
+    * @param sortList
+    */
+    public WindowHallQuery sortList(List<Integer> sortList){
+        this.sortList = sortList;
+		return this;
+        }
+
+        /**
+        * 设置 排序
+        * @param sortNotList
+        */
+        public WindowHallQuery sortNotList(List<Integer> sortNotList){
+        this.sortNotList = sortNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 备注
+    * @param remark
+    */
+    public WindowHallQuery remark(String remark){
+        setRemark(remark);
+		return this;
+    }
+
+    /**
+    * 设置 备注
+    * @param remarkList
+    */
+    public WindowHallQuery remarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+		return this;
+    }
+
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public WindowHallQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public WindowHallQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public WindowHallQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public WindowHallQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public WindowHallQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 创建用户
+        * @param createUserIdNotList
+        */
+        public WindowHallQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+        }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<WindowHallQuery> 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<WindowHallQuery> 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<WindowHallQuery> 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<WindowHallQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

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

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.window.model.WindowEntity;
  * 站点部门窗口查询对象
  *
  * @author zxfei
- * @date 2023-02-21
+ * @date 2023-05-04
  */
 public class WindowQuery extends WindowEntity {
     /** 开始 序号，主键，自增长 */
@@ -191,6 +191,16 @@ public class WindowQuery extends WindowEntity {
     /** 结束 修改时间 */
     private String updateTimeEnd;
 
+    /** 名称描述 */
+    private List<String> nameDescList;
+
+    /** 名称描述排除列表 */
+    private List <String> nameDescNotList;
+    /** 英文名称描述 */
+    private List<String> englishNameDescList;
+
+    /** 英文名称描述排除列表 */
+    private List <String> englishNameDescNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<WindowQuery> orConditionList;
 
@@ -1231,6 +1241,70 @@ public class WindowQuery extends WindowEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+     * 获取 名称描述
+     * @return nameDescList
+     */
+    public List<String> getNameDescList(){
+        return this.nameDescList;
+    }
+
+    /**
+     * 设置 名称描述
+     * @param nameDescList
+     */
+    public void setNameDescList(List<String> nameDescList){
+        this.nameDescList = nameDescList;
+    }
+
+    /**
+     * 获取 名称描述
+     * @return nameDescNotList
+     */
+    public List<String> getNameDescNotList(){
+        return this.nameDescNotList;
+    }
+
+    /**
+     * 设置 名称描述
+     * @param nameDescNotList
+     */
+    public void setNameDescNotList(List<String> nameDescNotList){
+        this.nameDescNotList = nameDescNotList;
+    }
+
+    /**
+     * 获取 英文名称描述
+     * @return englishNameDescList
+     */
+    public List<String> getEnglishNameDescList(){
+        return this.englishNameDescList;
+    }
+
+    /**
+     * 设置 英文名称描述
+     * @param englishNameDescList
+     */
+    public void setEnglishNameDescList(List<String> englishNameDescList){
+        this.englishNameDescList = englishNameDescList;
+    }
+
+    /**
+     * 获取 英文名称描述
+     * @return englishNameDescNotList
+     */
+    public List<String> getEnglishNameDescNotList(){
+        return this.englishNameDescNotList;
+    }
+
+    /**
+     * 设置 英文名称描述
+     * @param englishNameDescNotList
+     */
+    public void setEnglishNameDescNotList(List<String> englishNameDescNotList){
+        this.englishNameDescNotList = englishNameDescNotList;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -1855,6 +1929,44 @@ public class WindowQuery extends WindowEntity {
     }
 
 
+
+    /**
+     * 设置 名称描述
+     * @param nameDesc
+     */
+    public WindowQuery nameDesc(String nameDesc){
+        setNameDesc(nameDesc);
+        return this;
+    }
+
+    /**
+     * 设置 名称描述
+     * @param nameDescList
+     */
+    public WindowQuery nameDescList(List<String> nameDescList){
+        this.nameDescList = nameDescList;
+        return this;
+    }
+
+
+    /**
+     * 设置 英文名称描述
+     * @param englishNameDesc
+     */
+    public WindowQuery englishNameDesc(String englishNameDesc){
+        setEnglishNameDesc(englishNameDesc);
+        return this;
+    }
+
+    /**
+     * 设置 英文名称描述
+     * @param englishNameDescList
+     */
+    public WindowQuery englishNameDescList(List<String> englishNameDescList){
+        this.englishNameDescList = englishNameDescList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

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

 package com.mortals.xhx.module.window.model.vo;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.window.model.WindowBusinessEntity;
 import lombok.Data;
 
 import java.util.ArrayList;
 import java.util.List;
+
 /**
-* 窗口业务视图对象
-*
-* @author zxfei
-* @date 2022-01-12
-*/
+ * 窗口业务视图对象
+ *
+ * @author zxfei
+ * @date 2022-01-12
+ */
 @Data
 public class WindowBusinessVo extends BaseEntityLong {
 
@@ -25,7 +30,23 @@ public class WindowBusinessVo extends BaseEntityLong {
      */
     private String fromnum;
 
-    /** 窗口id列表 */
-    private List <Long> windowIdList;
+    /**
+     * 窗口id列表
+     */
+    private List<Long> windowIdList;
+
+    /**
+     * 大厅ID
+     */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
+    @JSONField(serialize = true)
+    private Long hallId;
+    /**
+     * 大厅名称
+     */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
+    @JSONField(serialize = true)
+    private String hallName;
+
 
 }
\ 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/model/vo/WindowVo.java

@@ -24,4 +24,13 @@ public class WindowVo extends BaseEntityLong {
 
     private List<WindowMatterEntity> windowMatterList;
 
+    /**
+     * 大厅ID
+     */
+    private Long hallId;
+    /**
+     * 大厅名称
+     */
+    private String hallName;
+
 }
\ 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.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.matter.model.MatterEntity;
+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/WindowService.java

 package com.mortals.xhx.module.window.service;
 
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
 import com.mortals.framework.service.ICRUDCacheService;
 import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.matter.model.MatterEntity;
 import com.mortals.xhx.module.window.dao.WindowDao;
 import com.mortals.xhx.module.window.model.WindowEntity;
 
@@ -29,4 +33,16 @@ public interface WindowService extends ICRUDCacheService<WindowEntity, Long> {
     void addBusinessToWindow(String businessIds, Long windowId, Context context);
 
 
+
+    /**
+     * 查找窗口大厅差集子项
+     * @param windowQuery
+     * @param pageInfo
+     * @param context
+     * @return
+     * @throws AppException
+     */
+    Result<WindowEntity> findSubHallList(WindowEntity windowQuery, PageInfo pageInfo, Context context) throws AppException;
+
+
 }
\ No newline at end of file

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

@@ -14,8 +14,8 @@ import com.mortals.xhx.module.business.model.BusinessQuery;
 import com.mortals.xhx.module.site.model.SiteBusinessEntity;
 import com.mortals.xhx.module.site.model.SiteBusinessQuery;
 import com.mortals.xhx.module.site.model.SiteEntity;
-import com.mortals.xhx.module.window.model.WindowEntity;
-import com.mortals.xhx.module.window.model.WindowQuery;
+import com.mortals.xhx.module.window.model.*;
+import com.mortals.xhx.module.window.service.WindowHallService;
 import com.mortals.xhx.module.window.service.WindowService;
 import lombok.extern.slf4j.Slf4j;
 import org.checkerframework.checker.units.qual.A;
@@ -24,11 +24,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.xhx.module.window.dao.WindowBusinessDao;
-import com.mortals.xhx.module.window.model.WindowBusinessEntity;
 import com.mortals.xhx.module.window.service.WindowBusinessService;
 import org.springframework.util.ObjectUtils;
 
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static com.mortals.framework.util.HttpUtil.HEADER_CONTENT_TYPE;
@@ -46,15 +46,26 @@ import static com.mortals.xhx.common.key.Constant.PARAM_SERVER_PHP_HTTP_URL;
 public class WindowBusinessServiceImpl extends AbstractCRUDServiceImpl<WindowBusinessDao, WindowBusinessEntity, Long> implements WindowBusinessService {
     @Autowired
     private WindowService windowService;
+    @Autowired
+    private WindowHallService windowHallService;
+
 
     @Override
     protected void findAfter(WindowBusinessEntity entity, PageInfo pageInfo, Context context, List<WindowBusinessEntity> list) throws AppException {
         Map<Long, WindowEntity> collect = windowService.findToMap(new WindowQuery(), context);
+
+        Map<Long, WindowHallEntity> windowHallEntityMap = windowHallService.find(new WindowHallQuery(), context).parallelStream().collect(Collectors.toMap(x -> x.getWindowId(), Function.identity()));
+
         Iterator iterator = list.iterator();
         while (iterator.hasNext()) {
             WindowBusinessEntity item = (WindowBusinessEntity) iterator.next();
             if (!ObjectUtils.isEmpty(item.getWindowId()) && !ObjectUtils.isEmpty(collect.get(item.getWindowId()))) {
                 item.setFromnum(collect.get(item.getWindowId()).getFromnum());
+                WindowHallEntity windowHallEntity = windowHallEntityMap.get(item.getWindowId());
+                if(!ObjectUtils.isEmpty(windowHallEntity)){
+                    item.setHallId( windowHallEntity.getWindowId());
+                    item.setHallName( windowHallEntity.getHallName());
+                }
             } else {
                 iterator.remove();
             }

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/service/impl/WindowServiceImpl.java

@@ -6,6 +6,7 @@ import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
 import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
 import com.mortals.framework.util.HttpUtil;
 import com.mortals.xhx.common.utils.BeanUtil;
@@ -18,6 +19,7 @@ import com.mortals.xhx.module.site.model.SiteEntity;
 import com.mortals.xhx.module.site.service.SiteBusinessService;
 import com.mortals.xhx.module.window.model.*;
 import com.mortals.xhx.module.window.service.WindowBusinessService;
+import com.mortals.xhx.module.window.service.WindowHallService;
 import com.mortals.xhx.module.window.service.WindowMatterService;
 import com.mortals.xhx.module.workman.model.WorkmanEntity;
 import com.mortals.xhx.module.workman.model.WorkmanQuery;
@@ -55,6 +57,8 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
     private WindowBusinessService windowBusinessService;
     @Autowired
     private WindowMatterService windowMatterService;
+    @Autowired
+    private WindowHallService windowHallService;
 
     @Autowired
     private BusinessService businessService;
@@ -69,6 +73,9 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
         Map<Long, List<WindowMatterEntity>> windowMatterCollect = windowMatterService.find(new WindowMatterQuery())
                 .stream().filter(f -> f.getWindowId() != null).collect(Collectors.groupingBy(x -> x.getWindowId()));
 
+        Map<Long, WindowHallEntity> windowHallMap = windowHallService.find(new WindowHallQuery()).parallelStream().collect(Collectors.toMap(x -> x.getWindowId(), y -> y, (o, n) -> n));
+
+
         list.stream().peek(item -> {
             if (!ObjectUtils.isEmpty(workmanCollect.get(item.getId()))) {
                 item.setWorkmanList(workmanCollect.get(item.getId()));
@@ -80,6 +87,11 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
             if (!ObjectUtils.isEmpty(windowMatterCollect.get(item.getId()))) {
                 item.setWindowMatterList(windowMatterCollect.get(item.getId()));
             }
+            WindowHallEntity windowHallEntity = windowHallMap.get(item.getId());
+            if (!ObjectUtils.isEmpty(windowHallEntity)) {
+                item.setHallId(windowHallEntity.getHallId());
+                item.setHallName(windowHallEntity.getHallName());
+            }
 
         }).count();
         super.findAfter(params, pageInfo, context, list);
@@ -128,6 +140,18 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
         windowBusinessService.save(windowBusinessEntities, context);
     }
 
+    /**
+     * @param windowQuery
+     * @param pageInfo
+     * @param context
+     * @return
+     * @throws AppException
+     */
+    @Override
+    public Result<WindowEntity> findSubHallList(WindowEntity windowQuery, PageInfo pageInfo, Context context) throws AppException {
+        return this.getDao().getSubHallList(windowQuery, pageInfo);
+    }
+
 
     @Override
     protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
@@ -136,7 +160,7 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
             WindowBusinessQuery windowBusinessQuery = new WindowBusinessQuery();
             windowBusinessQuery.setWindowIdList(Arrays.asList(ids));
             List<WindowBusinessEntity> windowBusinessEntities = windowBusinessService.find(windowBusinessQuery);
-            log.info("remove windowBusinessEntities size:{}",windowBusinessEntities.size());
+            log.info("remove windowBusinessEntities size:{}", windowBusinessEntities.size());
             if (!ObjectUtils.isEmpty(windowBusinessEntities)) {
                 Long[] idList = windowBusinessEntities.stream().map(item -> item.getId()).toArray(Long[]::new);
                 //windowBusinessService.removeList(windowBusinessEntities, context);
@@ -146,7 +170,7 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
             WindowMatterQuery windowMatterQuery = new WindowMatterQuery();
             windowMatterQuery.setWindowIdList(Arrays.asList(ids));
             List<WindowMatterEntity> windowMatterEntities = windowMatterService.find(windowMatterQuery);
-            log.info("remove windowMatterEntities size:{}",windowMatterEntities.size());
+            log.info("remove windowMatterEntities size:{}", windowMatterEntities.size());
             if (!ObjectUtils.isEmpty(windowMatterEntities)) {
                 Long[] idList = windowMatterEntities.stream().map(item -> item.getId()).toArray(Long[]::new);
                 windowMatterService.remove(idList, context);

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

 package com.mortals.xhx.module.window.web;
 
 import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
 import com.mortals.framework.util.DataUtil;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.matter.model.MatterEntity;
 import com.mortals.xhx.module.window.model.WindowEntity;
 import com.mortals.xhx.module.window.service.WindowBusinessService;
 import com.mortals.xhx.module.window.service.WindowService;
@@ -21,6 +26,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import static com.mortals.framework.ap.SysConstains.MESSAGE_INFO;
+import static com.mortals.framework.ap.SysConstains.PAGEINFO_KEY;
+
 /**
  * 站点部门窗口
  *
@@ -73,4 +81,33 @@ public class WindowController extends BaseCRUDJsonBodyMappingController<WindowSe
         return jsonObject.toJSONString();
     }
 
+
+
+    @PostMapping(value = "subHalllist")
+    @UnAuth
+    public Rest<Object> subHalllist(@RequestBody WindowEntity query) {
+        Rest<Object> ret = new Rest<>();
+        Map<String, Object> model = new HashMap<>();
+        Context context = this.getContext();
+        String busiDesc = "查询差集" + this.getModuleDesc();
+        int code=VALUE_RESULT_SUCCESS;
+        try {
+            PageInfo pageInfo = buildPageInfo(query);
+            Result<WindowEntity> result = this.getService().findSubHallList(query, pageInfo, context);
+            model.put(KEY_RESULT_DATA, result.getList());
+            model.put(PAGEINFO_KEY, result.getPageInfo());
+            parsePageInfo(model, result.getPageInfo());
+            model.put(MESSAGE_INFO, busiDesc + "成功");
+            recordSysLog(request, busiDesc + " 【成功】");
+        } catch (Exception e) {
+            code = VALUE_RESULT_FAILURE;
+            this.doException(request, busiDesc, model, e);
+        }
+        this.init(model, context);
+        ret.setCode(code);
+        ret.setData(model);
+        ret.setMsg(model.get(MESSAGE_INFO) == null ? "" : model.remove(MESSAGE_INFO).toString());
+        return ret;
+    }
+
 }
\ 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/main/java/com/mortals/xhx/module/workman/web/WorkmanForm.java

-package com.mortals.xhx.module.workman.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.workman.model.WorkmanEntity;
-import com.mortals.xhx.module.workman.model.WorkmanQuery;
-
-/**
-* Workman
-*
-* 工作人员 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class WorkmanForm extends BaseCRUDFormLong<WorkmanEntity> {
-    private WorkmanEntity entity = new WorkmanEntity();
-    private WorkmanQuery query = new WorkmanQuery();
-    public WorkmanForm(){
-    }
-
-    @Override
-    public WorkmanEntity getEntity() {
-        return entity;
-    }
-
-    public void setWorkman(WorkmanEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public WorkmanQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(WorkmanQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/resources/bootstrap.yml

@@ -37,6 +37,9 @@ spring:
         group: ${spring.cloud.nacos.discovery.group}
         namespace: ${spring.cloud.nacos.discovery.namespace} # Nacos 命名空间 dev 的编号
         file-extension: yaml
+druid:
+  mysql:
+    usePingMethod: false
 mybatis:
   root-path: com.mortals
   type-aliases-package: com.mortals.framework.model,com.mortals.xhx.common.**.model,com.mortals.xhx.**.model

base-manager/src/main/resources/config/mybatis-sqlmap-config.xml

@@ -9,12 +9,17 @@
 		<setting name="useGeneratedKeys" value="false" />
 		<setting name="defaultExecutorType" value="REUSE" />
 		<!-- 是否开始sql日志控制台打印 -->
-	<!--	<setting name="logImpl" value="STDOUT_LOGGING" />-->
+<!--		<setting name="logImpl" value="SLF4J" />-->
+<!--		<setting name="logImpl" value="SLF4J" />-->
 	</settings>
 	<plugins>
 		<plugin interceptor="com.mortals.framework.thirty.mybatis.MortalsPagePlugin">
 			<property name="dialect" value="MySql" />
 			<property name="showSql" value="MySql" />
 		</plugin>
+		<plugin interceptor="com.mortals.framework.thirty.mybatis.LogInterceptor">
+			<property name="enableExecutorTime" value="true" />
+			<property name="showSql" value="false" />
+		</plugin>
 	</plugins>
 </configuration>
\ No newline at end of file

base-manager/src/main/resources/logback-spring.xml

@@ -8,14 +8,9 @@
 
     <!-- appender用来格式化日志输出节点，有俩个属性name和class，class用来指定哪种输出策略，常用就是控制台输出策略和文件输出策略 -->
     <!-- 控制台输出策略-->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%X{traceId}] [%thread] [%.50c\(%L\)] - %msg%n</pattern>
-        </encoder>
-    </appender>
-    <!-- 文件输出策略-->
     <appender name="fileInfo" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 添加过滤器 -->
+<!--        <filter class="com.mortals.xhx.base.framework.filter.LogFilter" />-->
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%X{traceId}] [%thread] [%.50c\(%L\)] - %msg%n</pattern>
         </encoder>
@@ -27,6 +22,17 @@
             <!--日志文件保留天数-->
             <MaxHistory>15</MaxHistory>
         </rollingPolicy>
+
+    </appender>
+    <!-- 文件输出策略-->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- 添加过滤器 -->
+        <filter class="com.mortals.xhx.base.framework.filter.LogFilter" />
+        <encoder>
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%X{traceId}] [%thread] [%.50c\(%L\)] - %msg%n</pattern>
+        </encoder>
+
     </appender>
     <!-- 异常文件输出策略-->
     <appender name="fileError" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -44,12 +50,6 @@
         </rollingPolicy>
     </appender>
 
-    <root level="${logLevel}">
-        <appender-ref ref="console"/>
-        <appender-ref ref="fileInfo"/>
-        <appender-ref ref="fileError"/>
-    </root>
-
     <!--TRACE < DEBUG < INFO < WARN < ERROR < FATAL -->
 
     <!--用来设置某一个包或者具体的某一个类的日志打印级别、以及指定<appender>。<logger>仅有一个name属性，一个可选的level和一个可选的additivity属性。-->
@@ -57,20 +57,18 @@
     <!-- level 用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，还有一个特俗值INHERITED或者同义词NULL，代表强制执行上级的级别。如果未设置此属性，那么当前logger将会继承上级的级别-->
     <!-- additivity 是否向上级logger传递打印信息。默认是true。false：表示只用当前logger的appender-ref。true：表示当前logger的appender-ref和rootLogger的appender-ref都有效。-->
 
-    <logger name="com.mortals" level="${logLevel}" additivity="false">
+
+    <root level="info">
         <appender-ref ref="console"/>
         <appender-ref ref="fileInfo"/>
         <appender-ref ref="fileError"/>
-    </logger>
+    </root>
 
-    <logger name="com.mortals.xhx.module" level="${logLevel}" additivity="false">
+    <logger name="com.mortals" level="info" additivity="false">
         <appender-ref ref="console"/>
         <appender-ref ref="fileInfo"/>
         <appender-ref ref="fileError"/>
     </logger>
 
-    <logger name="com.mortals.xhx.module">
-        <level value="${logLevel}"/>
-    </logger>
 
 </configuration>
\ No newline at end of file

base-manager/src/main/resources/sqlmap/base/system/task.xml

@@ -189,6 +189,7 @@
 
 	<!-- 根据主健查询 -->
 	<select id="getByKey" parameterType="paramDto" resultMap="TaskEntity-Map">
+		<!-- no log -->
 		select <include refid="_columns"/>
 		from mortals_xhx_task as a
 	   where a.id=#{condition.id}
@@ -216,6 +217,7 @@
 	</delete>
 	<!-- 获取列表 -->
 	<select id="getList" parameterType="paramDto" resultMap="TaskEntity-Map">
+		<!-- no log -->
 		select <include refid="_columns"/>
 		  from mortals_xhx_task as a
 		 <trim suffixOverrides="where" suffix="">

base-manager/src/main/resources/sqlmap/module/matter/MatterMapperExt.xml

@@ -64,4 +64,18 @@
             </trim>
         </trim>
     </select>
+
+    <select id="getMatterListByAreaCode" parameterType="paramDto" resultMap="MatterEntity-Map">
+        select
+        a.matterNo
+        FROM
+        mortals_sys_matter AS a
+        where
+        <trim prefixOverrides="and" prefix="">
+            <if test="condition.areaCode!=null and condition.areaCode!=''">
+                and a.areaCode = #{condition.areaCode,jdbcType=VARCHAR}
+            </if>
+        </trim>
+    </select>
+
 </mapper>
\ No newline at end of file

base-manager/src/main/resources/sqlmap/module/site/SiteHallMapper.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.site.dao.ibatis.SiteHallDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="SiteHallEntity" id="SiteHallEntity-Map">
+            <id  property="id" column="id" />
+            <result property="siteId" column="siteId" />
+            <result property="siteName" column="siteName" />
+            <result property="hallName" column="hallName" />
+            <result property="address" column="address" />
+            <result property="floor" column="floor" />
+            <result property="build" column="build" />
+            <result property="remark" column="remark" />
+            <result property="createTime" column="createTime" />
+            <result property="createUserId" column="createUserId" />
+            <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('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
+                    a.siteId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
+                    a.siteName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('hallName') or colPickMode == 1 and data.containsKey('hallName')))">
+                    a.hallName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('address') or colPickMode == 1 and data.containsKey('address')))">
+                    a.address,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('floor') or colPickMode == 1 and data.containsKey('floor')))">
+                    a.floor,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('build') or colPickMode == 1 and data.containsKey('build')))">
+                    a.build,
+                </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('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.createTime,
+                </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('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="SiteHallEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_sys_site_hall
+        (siteId,siteName,hallName,address,floor,build,remark,createTime,createUserId,updateUserId,updateTime)
+        VALUES
+        (#{siteId},#{siteName},#{hallName},#{address},#{floor},#{build},#{remark},#{createTime},#{createUserId},#{updateUserId},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_sys_site_hall
+        (siteId,siteName,hallName,address,floor,build,remark,createTime,createUserId,updateUserId,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.siteId},#{item.siteName},#{item.hallName},#{item.address},#{item.floor},#{item.build},#{item.remark},#{item.createTime},#{item.createUserId},#{item.updateUserId},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_sys_site_hall as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
+                a.siteId=#{data.siteId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
+                a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteName')) or (colPickMode==1 and !data.containsKey('siteName'))">
+                a.siteName=#{data.siteName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('hallName')) or (colPickMode==1 and !data.containsKey('hallName'))">
+                a.hallName=#{data.hallName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('address')) or (colPickMode==1 and !data.containsKey('address'))">
+                a.address=#{data.address},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('floor')) or (colPickMode==1 and !data.containsKey('floor'))">
+                a.floor=#{data.floor},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('floorIncrement')) or (colPickMode==1 and !data.containsKey('floorIncrement'))">
+                a.floor=ifnull(a.floor,0) + #{data.floorIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('build')) or (colPickMode==1 and !data.containsKey('build'))">
+                a.build=#{data.build},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('buildIncrement')) or (colPickMode==1 and !data.containsKey('buildIncrement'))">
+                a.build=ifnull(a.build,0) + #{data.buildIncrement},
+            </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('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.createTime=#{data.createTime},
+            </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('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_sys_site_hall as a
+        <trim prefix="set" suffixOverrides=",">
+                        <trim prefix="siteId=(case" suffix="ELSE siteId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
+                                        when a.id=#{item.id} then #{item.siteId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="siteName=(case" suffix="ELSE siteName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('siteName')) or (colPickMode==1 and !item.containsKey('siteName'))">
+                            when a.id=#{item.id} then #{item.siteName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="hallName=(case" suffix="ELSE hallName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('hallName')) or (colPickMode==1 and !item.containsKey('hallName'))">
+                            when a.id=#{item.id} then #{item.hallName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="address=(case" suffix="ELSE address end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('address')) or (colPickMode==1 and !item.containsKey('address'))">
+                            when a.id=#{item.id} then #{item.address}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="floor=(case" suffix="ELSE floor end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('floor')) or (colPickMode==1 and !item.containsKey('floor'))">
+                                        when a.id=#{item.id} then #{item.floor}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('floorIncrement')) or (colPickMode==1 and !item.containsKey('floorIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.floor,0) + #{item.floorIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                        <trim prefix="build=(case" suffix="ELSE build end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('build')) or (colPickMode==1 and !item.containsKey('build'))">
+                                        when a.id=#{item.id} then #{item.build}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('buildIncrement')) or (colPickMode==1 and !item.containsKey('buildIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.build,0) + #{item.buildIncrement}
+                                    </when>
+                                </choose>
+                            </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="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="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="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="SiteHallEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_site_hall as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_sys_site_hall as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_sys_site_hall where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据主健列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeyList">
+        delete from mortals_sys_site_hall where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <!-- 根据对象列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByEntityList">
+        delete from mortals_sys_site_hall 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_sys_site_hall as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="SiteHallEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_site_hall 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_sys_site_hall 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('siteId')">
+                <if test="conditionParamRef.siteId != null ">
+                    ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
+                </if>
+                <if test="conditionParamRef.siteId == null">
+                    ${_conditionType_} a.siteId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+                ${_conditionType_} a.siteId in
+                <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
+                ${_conditionType_} a.siteId not in
+                <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
+                ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
+                ${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('siteName')">
+                <if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''">
+                    ${_conditionType_} a.siteName like #{${_conditionParam_}.siteName}
+                </if>
+                <if test="conditionParamRef.siteName == null">
+                    ${_conditionType_} a.siteName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
+                ${_conditionType_} a.siteName in
+                <foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
+                ${_conditionType_} a.siteName not in
+                <foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('hallName')">
+                <if test="conditionParamRef.hallName != null and conditionParamRef.hallName != ''">
+                    ${_conditionType_} a.hallName like #{${_conditionParam_}.hallName}
+                </if>
+                <if test="conditionParamRef.hallName == null">
+                    ${_conditionType_} a.hallName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('hallNameList') and conditionParamRef.hallNameList.size() > 0">
+                ${_conditionType_} a.hallName in
+                <foreach collection="conditionParamRef.hallNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('hallNameNotList') and conditionParamRef.hallNameNotList.size() > 0">
+                ${_conditionType_} a.hallName not in
+                <foreach collection="conditionParamRef.hallNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('address')">
+                <if test="conditionParamRef.address != null and conditionParamRef.address != ''">
+                    ${_conditionType_} a.address like #{${_conditionParam_}.address}
+                </if>
+                <if test="conditionParamRef.address == null">
+                    ${_conditionType_} a.address is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('addressList') and conditionParamRef.addressList.size() > 0">
+                ${_conditionType_} a.address in
+                <foreach collection="conditionParamRef.addressList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('addressNotList') and conditionParamRef.addressNotList.size() > 0">
+                ${_conditionType_} a.address not in
+                <foreach collection="conditionParamRef.addressNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('floor')">
+                <if test="conditionParamRef.floor != null ">
+                    ${_conditionType_} a.floor = #{${_conditionParam_}.floor}
+                </if>
+                <if test="conditionParamRef.floor == null">
+                    ${_conditionType_} a.floor is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('floorList') and conditionParamRef.floorList.size() > 0">
+                ${_conditionType_} a.floor in
+                <foreach collection="conditionParamRef.floorList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('floorNotList') and conditionParamRef.floorNotList.size() > 0">
+                ${_conditionType_} a.floor not in
+                <foreach collection="conditionParamRef.floorNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('floorStart') and conditionParamRef.floorStart != null">
+                ${_conditionType_} a.floor <![CDATA[ >= ]]> #{${_conditionParam_}.floorStart}
+            </if>
+            <if test="conditionParamRef.containsKey('floorEnd') and conditionParamRef.floorEnd != null">
+                ${_conditionType_} a.floor <![CDATA[ <= ]]> #{${_conditionParam_}.floorEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('build')">
+                <if test="conditionParamRef.build != null ">
+                    ${_conditionType_} a.build = #{${_conditionParam_}.build}
+                </if>
+                <if test="conditionParamRef.build == null">
+                    ${_conditionType_} a.build is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('buildList') and conditionParamRef.buildList.size() > 0">
+                ${_conditionType_} a.build in
+                <foreach collection="conditionParamRef.buildList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('buildNotList') and conditionParamRef.buildNotList.size() > 0">
+                ${_conditionType_} a.build not in
+                <foreach collection="conditionParamRef.buildNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('buildStart') and conditionParamRef.buildStart != null">
+                ${_conditionType_} a.build <![CDATA[ >= ]]> #{${_conditionParam_}.buildStart}
+            </if>
+            <if test="conditionParamRef.containsKey('buildEnd') and conditionParamRef.buildEnd != null">
+                ${_conditionType_} a.build <![CDATA[ <= ]]> #{${_conditionParam_}.buildEnd}
+            </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('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('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('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('siteId')">
+                        a.siteId
+                        <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('siteName')">
+                        a.siteName
+                        <if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('hallName')">
+                        a.hallName
+                        <if test='orderCol.hallName != null and "DESC".equalsIgnoreCase(orderCol.hallName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('address')">
+                        a.address
+                        <if test='orderCol.address != null and "DESC".equalsIgnoreCase(orderCol.address)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('floor')">
+                        a.floor
+                        <if test='orderCol.floor != null and "DESC".equalsIgnoreCase(orderCol.floor)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('build')">
+                        a.build
+                        <if test='orderCol.build != null and "DESC".equalsIgnoreCase(orderCol.build)'>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('createTime')">
+                        a.createTime
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>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('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

base-manager/src/main/resources/sqlmap/module/site/SiteThemeMatterMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"mybatis-3-mapper.dtd">
+        "mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.site.dao.ibatis.SiteThemeMatterDaoImpl">
 
     <!-- 字段和属性映射 -->
@@ -18,6 +18,8 @@
         <result property="createTime" column="createTime" />
         <result property="createUserId" column="createUserId" />
         <result property="updateTime" column="updateTime" />
+        <result property="hot" column="hot" />
+        <result property="display" column="display" />
 
     </resultMap>
 
@@ -64,23 +66,29 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
                 a.updateTime,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('hot') or colPickMode == 1 and data.containsKey('hot')))">
+                a.hot,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('display') or colPickMode == 1 and data.containsKey('display')))">
+                a.display,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="SiteThemeMatterEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_sys_site_theme_matter
-        (siteId,siteName,matterId,matterName,matterCode,userType,themeCode,themeName,source,createTime,createUserId,updateTime)
+        (siteId,siteName,matterId,matterName,matterCode,userType,themeCode,themeName,source,createTime,createUserId,updateTime,hot,display)
         VALUES
-        (#{siteId},#{siteName},#{matterId},#{matterName},#{matterCode},#{userType},#{themeCode},#{themeName},#{source},#{createTime},#{createUserId},#{updateTime})
+        (#{siteId},#{siteName},#{matterId},#{matterName},#{matterCode},#{userType},#{themeCode},#{themeName},#{source},#{createTime},#{createUserId},#{updateTime},#{hot},#{display})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_sys_site_theme_matter
-        (siteId,siteName,matterId,matterName,matterCode,userType,themeCode,themeName,source,createTime,createUserId,updateTime)
+        (siteId,siteName,matterId,matterName,matterCode,userType,themeCode,themeName,source,createTime,createUserId,updateTime,hot,display)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.siteId},#{item.siteName},#{item.matterId},#{item.matterName},#{item.matterCode},#{item.userType},#{item.themeCode},#{item.themeName},#{item.source},#{item.createTime},#{item.createUserId},#{item.updateTime})
+            (#{item.siteId},#{item.siteName},#{item.matterId},#{item.matterName},#{item.matterCode},#{item.userType},#{item.themeCode},#{item.themeName},#{item.source},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.hot},#{item.display})
         </foreach>
     </insert>
 
@@ -138,6 +146,18 @@
             <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
                 a.updateTime=#{data.updateTime},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('hot')) or (colPickMode==1 and !data.containsKey('hot'))">
+                a.hot=#{data.hot},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('hotIncrement')) or (colPickMode==1 and !data.containsKey('hotIncrement'))">
+                a.hot=ifnull(a.hot,0) + #{data.hotIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('display')) or (colPickMode==1 and !data.containsKey('display'))">
+                a.display=#{data.display},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('displayIncrement')) or (colPickMode==1 and !data.containsKey('displayIncrement'))">
+                a.display=ifnull(a.display,0) + #{data.displayIncrement},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -254,6 +274,30 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="hot=(case" suffix="ELSE hot end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('hot')) or (colPickMode==1 and !item.containsKey('hot'))">
+                            when a.id=#{item.id} then #{item.hot}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('hotIncrement')) or (colPickMode==1 and !item.containsKey('hotIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.hot,0) + #{item.hotIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="display=(case" suffix="ELSE display end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('display')) or (colPickMode==1 and !item.containsKey('display'))">
+                            when a.id=#{item.id} then #{item.display}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('displayIncrement')) or (colPickMode==1 and !item.containsKey('displayIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.display,0) + #{item.displayIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -378,12 +422,18 @@
                 ${_conditionType_} a.id is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('idList')">
+        <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>
@@ -399,12 +449,18 @@
                 ${_conditionType_} a.siteId is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('siteIdList')">
+        <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
             ${_conditionType_} a.siteId in
             <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
+            ${_conditionType_} a.siteId not in
+            <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
             ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
         </if>
@@ -421,12 +477,18 @@
                 ${_conditionType_} a.siteName is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('siteNameList')">
+        <if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
             ${_conditionType_} a.siteName in
             <foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
+            ${_conditionType_} a.siteName not in
+            <foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('matterId')">
             <if test="conditionParamRef.matterId != null ">
                 ${_conditionType_} a.matterId = #{${_conditionParam_}.matterId}
@@ -435,12 +497,18 @@
                 ${_conditionType_} a.matterId is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('matterIdList')">
+        <if test="conditionParamRef.containsKey('matterIdList') and conditionParamRef.matterIdList.size() > 0">
             ${_conditionType_} a.matterId in
             <foreach collection="conditionParamRef.matterIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('matterIdNotList') and conditionParamRef.matterIdNotList.size() > 0">
+            ${_conditionType_} a.matterId not in
+            <foreach collection="conditionParamRef.matterIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('matterIdStart') and conditionParamRef.matterIdStart != null">
             ${_conditionType_} a.matterId <![CDATA[ >= ]]> #{${_conditionParam_}.matterIdStart}
         </if>
@@ -457,12 +525,18 @@
                 ${_conditionType_} a.matterName is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('matterNameList')">
+        <if test="conditionParamRef.containsKey('matterNameList') and conditionParamRef.matterNameList.size() > 0">
             ${_conditionType_} a.matterName in
             <foreach collection="conditionParamRef.matterNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('matterNameNotList') and conditionParamRef.matterNameNotList.size() > 0">
+            ${_conditionType_} a.matterName not in
+            <foreach collection="conditionParamRef.matterNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('matterCode')">
             <if test="conditionParamRef.matterCode != null and conditionParamRef.matterCode != ''">
@@ -472,12 +546,18 @@
                 ${_conditionType_} a.matterCode is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('matterCodeList')">
+        <if test="conditionParamRef.containsKey('matterCodeList') and conditionParamRef.matterCodeList.size() > 0">
             ${_conditionType_} a.matterCode in
             <foreach collection="conditionParamRef.matterCodeList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('matterCodeNotList') and conditionParamRef.matterCodeNotList.size() > 0">
+            ${_conditionType_} a.matterCode not in
+            <foreach collection="conditionParamRef.matterCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('userType')">
             <if test="conditionParamRef.userType != null and conditionParamRef.userType != ''">
@@ -487,12 +567,18 @@
                 ${_conditionType_} a.userType is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('userTypeList')">
+        <if test="conditionParamRef.containsKey('userTypeList') and conditionParamRef.userTypeList.size() > 0">
             ${_conditionType_} a.userType in
             <foreach collection="conditionParamRef.userTypeList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('userTypeNotList') and conditionParamRef.userTypeNotList.size() > 0">
+            ${_conditionType_} a.userType not in
+            <foreach collection="conditionParamRef.userTypeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('themeCode')">
             <if test="conditionParamRef.themeCode != null and conditionParamRef.themeCode != ''">
@@ -502,12 +588,18 @@
                 ${_conditionType_} a.themeCode is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('themeCodeList')">
+        <if test="conditionParamRef.containsKey('themeCodeList') and conditionParamRef.themeCodeList.size() > 0">
             ${_conditionType_} a.themeCode in
             <foreach collection="conditionParamRef.themeCodeList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('themeCodeNotList') and conditionParamRef.themeCodeNotList.size() > 0">
+            ${_conditionType_} a.themeCode not in
+            <foreach collection="conditionParamRef.themeCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('themeName')">
             <if test="conditionParamRef.themeName != null and conditionParamRef.themeName != ''">
@@ -517,12 +609,18 @@
                 ${_conditionType_} a.themeName is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('themeNameList')">
+        <if test="conditionParamRef.containsKey('themeNameList') and conditionParamRef.themeNameList.size() > 0">
             ${_conditionType_} a.themeName in
             <foreach collection="conditionParamRef.themeNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('themeNameNotList') and conditionParamRef.themeNameNotList.size() > 0">
+            ${_conditionType_} a.themeName not in
+            <foreach collection="conditionParamRef.themeNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('source')">
             <if test="conditionParamRef.source != null ">
                 ${_conditionType_} a.source = #{${_conditionParam_}.source}
@@ -531,12 +629,18 @@
                 ${_conditionType_} a.source is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('sourceList')">
+        <if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
             ${_conditionType_} a.source in
             <foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('sourceNotList') and conditionParamRef.sourceNotList.size() > 0">
+            ${_conditionType_} a.source not in
+            <foreach collection="conditionParamRef.sourceNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('sourceStart') and conditionParamRef.sourceStart != null">
             ${_conditionType_} a.source <![CDATA[ >= ]]> #{${_conditionParam_}.sourceStart}
         </if>
@@ -567,12 +671,18 @@
                 ${_conditionType_} a.createUserId is null
             </if>
         </if>
-            <if test="conditionParamRef.containsKey('createUserIdList')">
+        <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>
@@ -595,6 +705,60 @@
         <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>
+        <if test="conditionParamRef.containsKey('hot')">
+            <if test="conditionParamRef.hot != null ">
+                ${_conditionType_} a.hot = #{${_conditionParam_}.hot}
+            </if>
+            <if test="conditionParamRef.hot == null">
+                ${_conditionType_} a.hot is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('hotList') and conditionParamRef.hotList.size() > 0">
+            ${_conditionType_} a.hot in
+            <foreach collection="conditionParamRef.hotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('hotNotList') and conditionParamRef.hotNotList.size() > 0">
+            ${_conditionType_} a.hot not in
+            <foreach collection="conditionParamRef.hotNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('hotStart') and conditionParamRef.hotStart != null">
+            ${_conditionType_} a.hot <![CDATA[ >= ]]> #{${_conditionParam_}.hotStart}
+        </if>
+        <if test="conditionParamRef.containsKey('hotEnd') and conditionParamRef.hotEnd != null">
+            ${_conditionType_} a.hot <![CDATA[ <= ]]> #{${_conditionParam_}.hotEnd}
+        </if>
+
+        <if test="conditionParamRef.containsKey('display')">
+            <if test="conditionParamRef.display != null ">
+                ${_conditionType_} a.display = #{${_conditionParam_}.display}
+            </if>
+            <if test="conditionParamRef.display == null">
+                ${_conditionType_} a.display is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('displayList') and conditionParamRef.displayList.size() > 0">
+            ${_conditionType_} a.display in
+            <foreach collection="conditionParamRef.displayList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('displayNotList') and conditionParamRef.displayNotList.size() > 0">
+            ${_conditionType_} a.display not in
+            <foreach collection="conditionParamRef.displayNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('displayStart') and conditionParamRef.displayStart != null">
+            ${_conditionType_} a.display <![CDATA[ >= ]]> #{${_conditionParam_}.displayStart}
+        </if>
+        <if test="conditionParamRef.containsKey('displayEnd') and conditionParamRef.displayEnd != null">
+            ${_conditionType_} a.display <![CDATA[ <= ]]> #{${_conditionParam_}.displayEnd}
+        </if>
+
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -673,6 +837,16 @@
                     <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('hot')">
+                    a.hot
+                    <if test='orderCol.hot != null and "DESC".equalsIgnoreCase(orderCol.hot)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('display')">
+                    a.display
+                    <if test='orderCol.display != null and "DESC".equalsIgnoreCase(orderCol.display)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>

base-manager/src/main/resources/sqlmap/module/window/WindowHallMapper.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.window.dao.ibatis.WindowHallDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="WindowHallEntity" id="WindowHallEntity-Map">
+            <id  property="id" column="id" />
+            <result property="windowId" column="windowId" />
+            <result property="windowName" column="windowName" />
+            <result property="hallId" column="hallId" />
+            <result property="hallName" column="hallName" />
+            <result property="sort" column="sort" />
+            <result property="remark" column="remark" />
+            <result property="createTime" column="createTime" />
+            <result property="createUserId" column="createUserId" />
+            <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('windowId') or colPickMode == 1 and data.containsKey('windowId')))">
+                    a.windowId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('windowName') or colPickMode == 1 and data.containsKey('windowName')))">
+                    a.windowName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('hallId') or colPickMode == 1 and data.containsKey('hallId')))">
+                    a.hallId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('hallName') or colPickMode == 1 and data.containsKey('hallName')))">
+                    a.hallName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sort') or colPickMode == 1 and data.containsKey('sort')))">
+                    a.sort,
+                </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('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.createTime,
+                </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('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                    a.updateTime,
+                </if>
+        </trim>
+    </sql>
+    <!-- 新增 区分主键自增加还是业务插入 -->
+    <insert id="insert" parameterType="WindowHallEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_sys_window_hall
+        (windowId,windowName,hallId,hallName,sort,remark,createTime,createUserId,updateTime)
+        VALUES
+        (#{windowId},#{windowName},#{hallId},#{hallName},#{sort},#{remark},#{createTime},#{createUserId},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_sys_window_hall
+        (windowId,windowName,hallId,hallName,sort,remark,createTime,createUserId,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.windowId},#{item.windowName},#{item.hallId},#{item.hallName},#{item.sort},#{item.remark},#{item.createTime},#{item.createUserId},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_sys_window_hall as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('windowId')) or (colPickMode==1 and !data.containsKey('windowId'))">
+                a.windowId=#{data.windowId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('windowIdIncrement')) or (colPickMode==1 and !data.containsKey('windowIdIncrement'))">
+                a.windowId=ifnull(a.windowId,0) + #{data.windowIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('windowName')) or (colPickMode==1 and !data.containsKey('windowName'))">
+                a.windowName=#{data.windowName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('hallId')) or (colPickMode==1 and !data.containsKey('hallId'))">
+                a.hallId=#{data.hallId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('hallIdIncrement')) or (colPickMode==1 and !data.containsKey('hallIdIncrement'))">
+                a.hallId=ifnull(a.hallId,0) + #{data.hallIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('hallName')) or (colPickMode==1 and !data.containsKey('hallName'))">
+                a.hallName=#{data.hallName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('sort')) or (colPickMode==1 and !data.containsKey('sort'))">
+                a.sort=#{data.sort},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('sortIncrement')) or (colPickMode==1 and !data.containsKey('sortIncrement'))">
+                a.sort=ifnull(a.sort,0) + #{data.sortIncrement},
+            </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('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.createTime=#{data.createTime},
+            </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('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_sys_window_hall as a
+        <trim prefix="set" suffixOverrides=",">
+                        <trim prefix="windowId=(case" suffix="ELSE windowId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('windowId')) or (colPickMode==1 and !item.containsKey('windowId'))">
+                                        when a.id=#{item.id} then #{item.windowId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('windowIdIncrement')) or (colPickMode==1 and !item.containsKey('windowIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.windowId,0) + #{item.windowIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="windowName=(case" suffix="ELSE windowName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('windowName')) or (colPickMode==1 and !item.containsKey('windowName'))">
+                            when a.id=#{item.id} then #{item.windowName}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="hallId=(case" suffix="ELSE hallId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('hallId')) or (colPickMode==1 and !item.containsKey('hallId'))">
+                                        when a.id=#{item.id} then #{item.hallId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('hallIdIncrement')) or (colPickMode==1 and !item.containsKey('hallIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.hallId,0) + #{item.hallIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="hallName=(case" suffix="ELSE hallName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('hallName')) or (colPickMode==1 and !item.containsKey('hallName'))">
+                            when a.id=#{item.id} then #{item.hallName}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="sort=(case" suffix="ELSE sort end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('sort')) or (colPickMode==1 and !item.containsKey('sort'))">
+                                        when a.id=#{item.id} then #{item.sort}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('sortIncrement')) or (colPickMode==1 and !item.containsKey('sortIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.sort,0) + #{item.sortIncrement}
+                                    </when>
+                                </choose>
+                            </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="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="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="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="WindowHallEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_window_hall as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_sys_window_hall as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_sys_window_hall where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据主健列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeyList">
+        delete from mortals_sys_window_hall where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <!-- 根据对象列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByEntityList">
+        delete from mortals_sys_window_hall 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_sys_window_hall as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="WindowHallEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_window_hall 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_sys_window_hall 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('windowId')">
+                <if test="conditionParamRef.windowId != null ">
+                    ${_conditionType_} a.windowId = #{${_conditionParam_}.windowId}
+                </if>
+                <if test="conditionParamRef.windowId == null">
+                    ${_conditionType_} a.windowId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('windowIdList') and conditionParamRef.windowIdList.size() > 0">
+                ${_conditionType_} a.windowId in
+                <foreach collection="conditionParamRef.windowIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('windowIdNotList') and conditionParamRef.windowIdNotList.size() > 0">
+                ${_conditionType_} a.windowId not in
+                <foreach collection="conditionParamRef.windowIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('windowIdStart') and conditionParamRef.windowIdStart != null">
+                ${_conditionType_} a.windowId <![CDATA[ >= ]]> #{${_conditionParam_}.windowIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('windowIdEnd') and conditionParamRef.windowIdEnd != null">
+                ${_conditionType_} a.windowId <![CDATA[ <= ]]> #{${_conditionParam_}.windowIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('windowName')">
+                <if test="conditionParamRef.windowName != null and conditionParamRef.windowName != ''">
+                    ${_conditionType_} a.windowName like #{${_conditionParam_}.windowName}
+                </if>
+                <if test="conditionParamRef.windowName == null">
+                    ${_conditionType_} a.windowName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('windowNameList') and conditionParamRef.windowNameList.size() > 0">
+                ${_conditionType_} a.windowName in
+                <foreach collection="conditionParamRef.windowNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('windowNameNotList') and conditionParamRef.windowNameNotList.size() > 0">
+                ${_conditionType_} a.windowName not in
+                <foreach collection="conditionParamRef.windowNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('hallId')">
+                <if test="conditionParamRef.hallId != null ">
+                    ${_conditionType_} a.hallId = #{${_conditionParam_}.hallId}
+                </if>
+                <if test="conditionParamRef.hallId == null">
+                    ${_conditionType_} a.hallId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('hallIdList') and conditionParamRef.hallIdList.size() > 0">
+                ${_conditionType_} a.hallId in
+                <foreach collection="conditionParamRef.hallIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('hallIdNotList') and conditionParamRef.hallIdNotList.size() > 0">
+                ${_conditionType_} a.hallId not in
+                <foreach collection="conditionParamRef.hallIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('hallIdStart') and conditionParamRef.hallIdStart != null">
+                ${_conditionType_} a.hallId <![CDATA[ >= ]]> #{${_conditionParam_}.hallIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('hallIdEnd') and conditionParamRef.hallIdEnd != null">
+                ${_conditionType_} a.hallId <![CDATA[ <= ]]> #{${_conditionParam_}.hallIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('hallName')">
+                <if test="conditionParamRef.hallName != null and conditionParamRef.hallName != ''">
+                    ${_conditionType_} a.hallName like #{${_conditionParam_}.hallName}
+                </if>
+                <if test="conditionParamRef.hallName == null">
+                    ${_conditionType_} a.hallName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('hallNameList') and conditionParamRef.hallNameList.size() > 0">
+                ${_conditionType_} a.hallName in
+                <foreach collection="conditionParamRef.hallNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('hallNameNotList') and conditionParamRef.hallNameNotList.size() > 0">
+                ${_conditionType_} a.hallName not in
+                <foreach collection="conditionParamRef.hallNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('sort')">
+                <if test="conditionParamRef.sort != null ">
+                    ${_conditionType_} a.sort = #{${_conditionParam_}.sort}
+                </if>
+                <if test="conditionParamRef.sort == null">
+                    ${_conditionType_} a.sort is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('sortList') and conditionParamRef.sortList.size() > 0">
+                ${_conditionType_} a.sort in
+                <foreach collection="conditionParamRef.sortList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('sortNotList') and conditionParamRef.sortNotList.size() > 0">
+                ${_conditionType_} a.sort not in
+                <foreach collection="conditionParamRef.sortNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('sortStart') and conditionParamRef.sortStart != null">
+                ${_conditionType_} a.sort <![CDATA[ >= ]]> #{${_conditionParam_}.sortStart}
+            </if>
+            <if test="conditionParamRef.containsKey('sortEnd') and conditionParamRef.sortEnd != null">
+                ${_conditionType_} a.sort <![CDATA[ <= ]]> #{${_conditionParam_}.sortEnd}
+            </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('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('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('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('windowId')">
+                        a.windowId
+                        <if test='orderCol.windowId != null and "DESC".equalsIgnoreCase(orderCol.windowId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('windowName')">
+                        a.windowName
+                        <if test='orderCol.windowName != null and "DESC".equalsIgnoreCase(orderCol.windowName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('hallId')">
+                        a.hallId
+                        <if test='orderCol.hallId != null and "DESC".equalsIgnoreCase(orderCol.hallId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('hallName')">
+                        a.hallName
+                        <if test='orderCol.hallName != null and "DESC".equalsIgnoreCase(orderCol.hallName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('sort')">
+                        a.sort
+                        <if test='orderCol.sort != null and "DESC".equalsIgnoreCase(orderCol.sort)'>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('createTime')">
+                        a.createTime
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>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('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

base-manager/src/main/resources/sqlmap/module/window/WindowMapper.xml

@@ -25,6 +25,8 @@
         <result property="createTime" column="createTime" />
         <result property="createUserId" column="createUserId" />
         <result property="updateTime" column="updateTime" />
+        <result property="nameDesc" column="nameDesc" />
+        <result property="englishNameDesc" column="englishNameDesc" />
 
     </resultMap>
 
@@ -92,23 +94,29 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
                 a.updateTime,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('nameDesc') or colPickMode == 1 and data.containsKey('nameDesc')))">
+                a.nameDesc,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('englishNameDesc') or colPickMode == 1 and data.containsKey('englishNameDesc')))">
+                a.englishNameDesc,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="WindowEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_sys_window
-        (siteId,siteName,deptId,deptName,name,englishName,region,englishRegion,fromnum,hongqi,duty,dutyContent,dutyEnglish,summary,building,level,createTime,createUserId,updateTime)
+        (siteId,siteName,deptId,deptName,name,englishName,region,englishRegion,fromnum,hongqi,duty,dutyContent,dutyEnglish,summary,building,level,createTime,createUserId,updateTime,nameDesc,englishNameDesc)
         VALUES
-        (#{siteId},#{siteName},#{deptId},#{deptName},#{name},#{englishName},#{region},#{englishRegion},#{fromnum},#{hongqi},#{duty},#{dutyContent},#{dutyEnglish},#{summary},#{building},#{level},#{createTime},#{createUserId},#{updateTime})
+        (#{siteId},#{siteName},#{deptId},#{deptName},#{name},#{englishName},#{region},#{englishRegion},#{fromnum},#{hongqi},#{duty},#{dutyContent},#{dutyEnglish},#{summary},#{building},#{level},#{createTime},#{createUserId},#{updateTime},#{nameDesc},#{englishNameDesc})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_sys_window
-        (siteId,siteName,deptId,deptName,name,englishName,region,englishRegion,fromnum,hongqi,duty,dutyContent,dutyEnglish,summary,building,level,createTime,createUserId,updateTime)
+        (siteId,siteName,deptId,deptName,name,englishName,region,englishRegion,fromnum,hongqi,duty,dutyContent,dutyEnglish,summary,building,level,createTime,createUserId,updateTime,nameDesc,englishNameDesc)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.siteId},#{item.siteName},#{item.deptId},#{item.deptName},#{item.name},#{item.englishName},#{item.region},#{item.englishRegion},#{item.fromnum},#{item.hongqi},#{item.duty},#{item.dutyContent},#{item.dutyEnglish},#{item.summary},#{item.building},#{item.level},#{item.createTime},#{item.createUserId},#{item.updateTime})
+            (#{item.siteId},#{item.siteName},#{item.deptId},#{item.deptName},#{item.name},#{item.englishName},#{item.region},#{item.englishRegion},#{item.fromnum},#{item.hongqi},#{item.duty},#{item.dutyContent},#{item.dutyEnglish},#{item.summary},#{item.building},#{item.level},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.nameDesc},#{item.englishNameDesc})
         </foreach>
     </insert>
 
@@ -196,6 +204,12 @@
             <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
                 a.updateTime=#{data.updateTime},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('nameDesc')) or (colPickMode==1 and !data.containsKey('nameDesc'))">
+                a.nameDesc=#{data.nameDesc},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('englishNameDesc')) or (colPickMode==1 and !data.containsKey('englishNameDesc'))">
+                a.englishNameDesc=#{data.englishNameDesc},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -376,6 +390,20 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="nameDesc=(case" suffix="ELSE nameDesc end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('nameDesc')) or (colPickMode==1 and !item.containsKey('nameDesc'))">
+                        when a.id=#{item.id} then #{item.nameDesc}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="englishNameDesc=(case" suffix="ELSE englishNameDesc end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('englishNameDesc')) or (colPickMode==1 and !item.containsKey('englishNameDesc'))">
+                        when a.id=#{item.id} then #{item.englishNameDesc}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -500,13 +528,13 @@
                 ${_conditionType_} a.id is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('idList')">
+        <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')">
+        <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}
@@ -527,13 +555,13 @@
                 ${_conditionType_} a.siteId is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('siteIdList')">
+        <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
             ${_conditionType_} a.siteId in
             <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('siteIdNotList')">
+        <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
             ${_conditionType_} a.siteId not in
             <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -555,13 +583,13 @@
                 ${_conditionType_} a.siteName is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('siteNameList')">
+        <if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
             ${_conditionType_} a.siteName in
             <foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('siteNameNotList')">
+        <if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
             ${_conditionType_} a.siteName not in
             <foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -575,13 +603,13 @@
                 ${_conditionType_} a.deptId is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('deptIdList')">
+        <if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
             ${_conditionType_} a.deptId in
             <foreach collection="conditionParamRef.deptIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('deptIdNotList')">
+        <if test="conditionParamRef.containsKey('deptIdNotList') and conditionParamRef.deptIdNotList.size() > 0">
             ${_conditionType_} a.deptId not in
             <foreach collection="conditionParamRef.deptIdNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -603,13 +631,13 @@
                 ${_conditionType_} a.deptName is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('deptNameList')">
+        <if test="conditionParamRef.containsKey('deptNameList') and conditionParamRef.deptNameList.size() > 0">
             ${_conditionType_} a.deptName in
             <foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('deptNameNotList')">
+        <if test="conditionParamRef.containsKey('deptNameNotList') and conditionParamRef.deptNameNotList.size() > 0">
             ${_conditionType_} a.deptName not in
             <foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -624,13 +652,13 @@
                 ${_conditionType_} a.name is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('nameList')">
+        <if test="conditionParamRef.containsKey('nameList') and conditionParamRef.nameList.size() > 0">
             ${_conditionType_} a.name in
             <foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('nameNotList')">
+        <if test="conditionParamRef.containsKey('nameNotList') and conditionParamRef.nameNotList.size() > 0">
             ${_conditionType_} a.name not in
             <foreach collection="conditionParamRef.nameNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -645,13 +673,13 @@
                 ${_conditionType_} a.englishName is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('englishNameList')">
+        <if test="conditionParamRef.containsKey('englishNameList') and conditionParamRef.englishNameList.size() > 0">
             ${_conditionType_} a.englishName in
             <foreach collection="conditionParamRef.englishNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('englishNameNotList')">
+        <if test="conditionParamRef.containsKey('englishNameNotList') and conditionParamRef.englishNameNotList.size() > 0">
             ${_conditionType_} a.englishName not in
             <foreach collection="conditionParamRef.englishNameNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -666,13 +694,13 @@
                 ${_conditionType_} a.region is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('regionList')">
+        <if test="conditionParamRef.containsKey('regionList') and conditionParamRef.regionList.size() > 0">
             ${_conditionType_} a.region in
             <foreach collection="conditionParamRef.regionList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('regionNotList')">
+        <if test="conditionParamRef.containsKey('regionNotList') and conditionParamRef.regionNotList.size() > 0">
             ${_conditionType_} a.region not in
             <foreach collection="conditionParamRef.regionNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -687,13 +715,13 @@
                 ${_conditionType_} a.englishRegion is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('englishRegionList')">
+        <if test="conditionParamRef.containsKey('englishRegionList') and conditionParamRef.englishRegionList.size() > 0">
             ${_conditionType_} a.englishRegion in
             <foreach collection="conditionParamRef.englishRegionList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('englishRegionNotList')">
+        <if test="conditionParamRef.containsKey('englishRegionNotList') and conditionParamRef.englishRegionNotList.size() > 0">
             ${_conditionType_} a.englishRegion not in
             <foreach collection="conditionParamRef.englishRegionNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -708,13 +736,13 @@
                 ${_conditionType_} a.fromnum is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('fromnumList')">
+        <if test="conditionParamRef.containsKey('fromnumList') and conditionParamRef.fromnumList.size() > 0">
             ${_conditionType_} a.fromnum in
             <foreach collection="conditionParamRef.fromnumList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('fromnumNotList')">
+        <if test="conditionParamRef.containsKey('fromnumNotList') and conditionParamRef.fromnumNotList.size() > 0">
             ${_conditionType_} a.fromnum not in
             <foreach collection="conditionParamRef.fromnumNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -728,13 +756,13 @@
                 ${_conditionType_} a.hongqi is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('hongqiList')">
+        <if test="conditionParamRef.containsKey('hongqiList') and conditionParamRef.hongqiList.size() > 0">
             ${_conditionType_} a.hongqi in
             <foreach collection="conditionParamRef.hongqiList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('hongqiNotList')">
+        <if test="conditionParamRef.containsKey('hongqiNotList') and conditionParamRef.hongqiNotList.size() > 0">
             ${_conditionType_} a.hongqi not in
             <foreach collection="conditionParamRef.hongqiNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -755,13 +783,13 @@
                 ${_conditionType_} a.duty is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('dutyList')">
+        <if test="conditionParamRef.containsKey('dutyList') and conditionParamRef.dutyList.size() > 0">
             ${_conditionType_} a.duty in
             <foreach collection="conditionParamRef.dutyList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('dutyNotList')">
+        <if test="conditionParamRef.containsKey('dutyNotList') and conditionParamRef.dutyNotList.size() > 0">
             ${_conditionType_} a.duty not in
             <foreach collection="conditionParamRef.dutyNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -783,13 +811,13 @@
                 ${_conditionType_} a.dutyContent is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('dutyContentList')">
+        <if test="conditionParamRef.containsKey('dutyContentList') and conditionParamRef.dutyContentList.size() > 0">
             ${_conditionType_} a.dutyContent in
             <foreach collection="conditionParamRef.dutyContentList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('dutyContentNotList')">
+        <if test="conditionParamRef.containsKey('dutyContentNotList') and conditionParamRef.dutyContentNotList.size() > 0">
             ${_conditionType_} a.dutyContent not in
             <foreach collection="conditionParamRef.dutyContentNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -804,13 +832,13 @@
                 ${_conditionType_} a.dutyEnglish is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('dutyEnglishList')">
+        <if test="conditionParamRef.containsKey('dutyEnglishList') and conditionParamRef.dutyEnglishList.size() > 0">
             ${_conditionType_} a.dutyEnglish in
             <foreach collection="conditionParamRef.dutyEnglishList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('dutyEnglishNotList')">
+        <if test="conditionParamRef.containsKey('dutyEnglishNotList') and conditionParamRef.dutyEnglishNotList.size() > 0">
             ${_conditionType_} a.dutyEnglish not in
             <foreach collection="conditionParamRef.dutyEnglishNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -825,13 +853,13 @@
                 ${_conditionType_} a.summary is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('summaryList')">
+        <if test="conditionParamRef.containsKey('summaryList') and conditionParamRef.summaryList.size() > 0">
             ${_conditionType_} a.summary in
             <foreach collection="conditionParamRef.summaryList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('summaryNotList')">
+        <if test="conditionParamRef.containsKey('summaryNotList') and conditionParamRef.summaryNotList.size() > 0">
             ${_conditionType_} a.summary not in
             <foreach collection="conditionParamRef.summaryNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -845,13 +873,13 @@
                 ${_conditionType_} a.building is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('buildingList')">
+        <if test="conditionParamRef.containsKey('buildingList') and conditionParamRef.buildingList.size() > 0">
             ${_conditionType_} a.building in
             <foreach collection="conditionParamRef.buildingList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('buildingNotList')">
+        <if test="conditionParamRef.containsKey('buildingNotList') and conditionParamRef.buildingNotList.size() > 0">
             ${_conditionType_} a.building not in
             <foreach collection="conditionParamRef.buildingNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -872,13 +900,13 @@
                 ${_conditionType_} a.level is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('levelList')">
+        <if test="conditionParamRef.containsKey('levelList') and conditionParamRef.levelList.size() > 0">
             ${_conditionType_} a.level in
             <foreach collection="conditionParamRef.levelList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('levelNotList')">
+        <if test="conditionParamRef.containsKey('levelNotList') and conditionParamRef.levelNotList.size() > 0">
             ${_conditionType_} a.level not in
             <foreach collection="conditionParamRef.levelNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
@@ -914,13 +942,13 @@
                 ${_conditionType_} a.createUserId is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('createUserIdList')">
+        <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')">
+        <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}
@@ -948,6 +976,48 @@
         <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>
+
+        <if test="conditionParamRef.containsKey('nameDesc')">
+            <if test="conditionParamRef.nameDesc != null and conditionParamRef.nameDesc != ''">
+                ${_conditionType_} a.nameDesc like #{${_conditionParam_}.nameDesc}
+            </if>
+            <if test="conditionParamRef.nameDesc == null">
+                ${_conditionType_} a.nameDesc is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('nameDescList') and conditionParamRef.nameDescList.size() > 0">
+            ${_conditionType_} a.nameDesc in
+            <foreach collection="conditionParamRef.nameDescList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('nameDescNotList') and conditionParamRef.nameDescNotList.size() > 0">
+            ${_conditionType_} a.nameDesc not in
+            <foreach collection="conditionParamRef.nameDescNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('englishNameDesc')">
+            <if test="conditionParamRef.englishNameDesc != null and conditionParamRef.englishNameDesc != ''">
+                ${_conditionType_} a.englishNameDesc like #{${_conditionParam_}.englishNameDesc}
+            </if>
+            <if test="conditionParamRef.englishNameDesc == null">
+                ${_conditionType_} a.englishNameDesc is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('englishNameDescList') and conditionParamRef.englishNameDescList.size() > 0">
+            ${_conditionType_} a.englishNameDesc in
+            <foreach collection="conditionParamRef.englishNameDescList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('englishNameDescNotList') and conditionParamRef.englishNameDescNotList.size() > 0">
+            ${_conditionType_} a.englishNameDesc not in
+            <foreach collection="conditionParamRef.englishNameDescNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1061,6 +1131,16 @@
                     <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('nameDesc')">
+                    a.nameDesc
+                    <if test='orderCol.nameDesc != null and "DESC".equalsIgnoreCase(orderCol.nameDesc)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('englishNameDesc')">
+                    a.englishNameDesc
+                    <if test='orderCol.englishNameDesc != null and "DESC".equalsIgnoreCase(orderCol.englishNameDesc)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>

base-manager/src/main/resources/sqlmap/module/window/WindowMapperExt.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.window.dao.ibatis.WindowDaoImpl">
+    <select id="getSubHallListCount" parameterType="paramDto" resultType="int">
+        SELECT
+        count( 1 )
+        FROM
+        mortals_sys_window AS a
+        LEFT JOIN ( SELECT windowId FROM mortals_sys_window_hall
+        )AS b ON a.id = b.windowId where b.windowId IS NULL and
+        <trim prefixOverrides="and" prefix="">
+            <if test="condition.siteId!=null and condition.siteId!=''">
+                and a.siteId = #{condition.siteId}
+            </if>
+        </trim>
+    </select>
+
+    <!-- 获取事项差集列表列表 -->
+    <select id="getSubHallList" parameterType="paramDto" resultMap="WindowEntity-Map">
+        SELECT
+        <include refid="_columns"/>
+        FROM
+        mortals_sys_window AS a
+        LEFT JOIN ( SELECT windowId FROM mortals_sys_window_hall
+        )AS b ON a.id = b.windowId where b.windowId IS NULL and
+
+        <trim prefixOverrides="and" prefix="">
+            <if test="condition.siteId!=null and condition.siteId!=''">
+                and a.siteId = #{condition.siteId}
+            </if>
+        </trim>
+
+    </select>
+</mapper>
\ No newline at end of file

base-manager/src/test/java/com/mortals/httpclient/app/AppController.http

@@ -18,11 +18,8 @@ POST {{baseUrl}}/app/list
 Content-Type: application/json
 
 {
-  "siteId":1,
-  "type": 2,
-  "shelves": 1,
   "page":1,
-  "size":-1
+  "size":1
 }
 
 

base-manager/src/test/java/com/mortals/httpclient/dept/DeptController.http

@@ -4,9 +4,11 @@ POST {{baseUrl}}/dept/list
 Content-Type: application/json
 
 {
+  "siteId": 1,
+    "isWorkGuide":1 ,
     "filter":1 ,
     "page":1,
-    "size":10
+    "size":-1
 }
 
 

base-manager/src/test/java/com/mortals/httpclient/http-client.env.json

@@ -22,6 +22,9 @@
   "base-yibin-web": {
     "baseUrl": "http://112.19.80.237:11078/base"
   },
+  "base-yibin-web-https": {
+    "baseUrl": "https://ybswxxcx.zwfwhfgjjfzj.yibin.gov.cn/base"
+  },
 
   "base-yibin-php": {
     "phpUrl": "http://112.19.80.237:8090"

base-manager/src/test/java/com/mortals/httpclient/matter/MatterController.http

@@ -22,7 +22,7 @@ Content-Type: application/json
 {
   "siteId": 1,
   "page": 1,
-  "size": 100
+  "size": 2
 }
 
 ###微官网事项列表

base-manager/src/test/java/com/mortals/httpclient/site/SiteBusinessController.http

@@ -6,8 +6,8 @@ Content-Type: application/json
 {
   "idNotList": [11,18,17,14,27,28],
    "siteId": 1,
-    "page":1,
-    "size":10
+    "page":3,
+    "size":1
 }
 
 ###站点业务列表

base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http

@@ -104,7 +104,7 @@ POST {{baseUrl}}/site/syncGovMatterBySiteId
 Content-Type: application/json
 
 {
-  "id":3
+  "id":1
 }
 
 

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
+Content-Type: application/json
+
+{
+    "page":1,
+    "size":10
+}
+
+
+###站点大厅信息列表
+POST {{baseUrl}}/site/hall/getBusinessByHall
+Content-Type: application/json
+
+{
+  "id":1
+}
+
+
+###站点大厅信息更新与保存
+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/site/SiteMatterController.http

@@ -6,7 +6,9 @@ Content-Type: application/json
 {
     "siteId":1,
     "page":1,
-  "matterName":"加处罚款",
+  "deptCode":"008702197",
+  "display": 1,
+  "source": 1,
     "size":10
 }
 

base-manager/src/test/java/com/mortals/httpclient/window/WindowController.http

@@ -11,6 +11,16 @@ Content-Type: application/json
   "fromnum": "1E%"
 }
 
+###站点部门窗口列表
+POST {{baseUrl}}/window/subHalllist
+Content-Type: application/json
+
+{
+  "siteId":1,
+  "page":1,
+  "size":10
+}
+
 
 ###站点部门窗口更新与保存
 POST {{baseUrl}}/window/save

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
+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
+
+
+
+

portal-manager-ui/admin/src/api/dataActuary.js

@@ -31,3 +31,7 @@ export function getInformationFlow(params) {
 export function productLlist(params) {
   return http.post(`${baseURL}/zwfw/page/info/product/list`, params);
 }
+// 热力图对应的页面
+export function pageLlist(params) {
+  return http.post(`${baseURL}/zwfw/page/info/list`, params);
+}
\ No newline at end of file

portal-manager-ui/admin/src/views/dataActuary/behaviour/mixins/product.js

@@ -9,6 +9,7 @@ export default {
         this.getProductLlist()
     },
     methods: {
+        
         getProductLlist(){
             productLlist({"size":-1}).then(res=>{
               this.ProductLlist = res.data.data

portal-manager-ui/admin/src/views/dataActuary/behaviour/product/product.vue

@@ -8,7 +8,7 @@
 		<div class="list-dv">
 			<a-form-model :model="queryform" :label-col="labelCol" :wrapper-col="wrapperCol" layout="inline">
 				<a-form-model-item>
-					<a-select v-model="queryform.productId" style="width: 200px" placeholder="选择产品">
+					<a-select v-model="queryform.productId" style="width: 200px" placeholder="选择产品" @change="changeProductId">
 						<a-select-option :value="item.id" v-for="(item,index) in product" :key="index">
 							{{item.title}}
 						</a-select-option>
@@ -33,7 +33,7 @@
 			<div class="main">
 				<div class="total-dv">
 					<div>总点击次数</div>
-					<div>312321</div>
+					<div>{{clickSum}}</div>
 				</div>
 				<div style="margin-bottom: 20px;">事件排名Top10</div>
 				<a-table :columns="columns" :data-source="data" :scroll="{ y: 590 }" :pagination="false">
@@ -48,7 +48,8 @@
 	import Heatmap from 'heatmap.js';
 	import moment from 'moment';
 	import {
-		getProductHotCensus
+		getProductHotCensus,
+		pageLlist
 	} from '@/api/dataActuary.js'
 	export default {
 		mixins:[product],
@@ -101,21 +102,47 @@
 				heatmapInstance: null,
 				dataPoint: [],
 				img: '',
-				BASE_URL: process.env.VUE_APP_API_BASE_URL + '/'
+				BASE_URL: process.env.VUE_APP_API_BASE_URL + '/',
+				clickSum:0,//总次数
+				ProductLlist:[]
 			}
 		},
 		mounted() {
 			this.init('queuing')
+			this.getPageLlist()
 		},
 		methods: {
+			// 选择产品
+			changeProductId(v){
+				this.getPageLlist(v)
+			},
+			// 查询页面
+			getPageLlist(productId = 1){
+				pageLlist({productId:productId,size:-1}).then(res=>{
+					const {data} = res.data
+					let arr = []
+					if(data && data.length > 0){
+						data.forEach(element => {
+							arr.push({title:element.pageName,id:element.pageCode})
+						});
+						this.page = arr
+					}else{
+						this.page  = [{
+							title: '首页',
+							id: '/'
+						}]
+					}
+				})
+			},
 			getList() {
 				this.queryform.dateTimeStart = this.time ? this.time[0] : null
 				this.queryform.dateTimeStart = this.time ? this.time[1] : null
 				getProductHotCensus(this.queryform).then(res => {
+					this.clickSum = res.data.clickSum
 					this.data = res.data.data
-					this.img = res.data.screenUrl
+					this.img = (process.env.NODE_ENV == 'development')?`${this.BASE_URL}${res.data.screenUrl}`:res.data.screenUrl
 					let imgSize = new Image();
-					imgSize.src = this.BASE_URL + this.img;
+					imgSize.src = this.img;
 					imgSize.onload = () => {
 						let w = this.$refs.img.width / imgSize.width
 						let h = this.$refs.img.height / imgSize.height

portal-manager-ui/admin/src/views/dataAdmin/components/IOT/alerting.vue

@@ -165,6 +165,42 @@ export default {
       this.$refs.Details.modalInfo.title = "告警详情";
       this.$refs.Details.modalInfo.visible = true;
     },
+    // 导出
+    async handleExportTable() {
+      this.btnLoading = true;
+      let data = [];
+      if (this.tableSelectedKeys.length && this.tableSelectedRows.length) {
+        // 深度克隆避免影响页面表格展示
+        data = this.$_.cloneDeep(this.tableSelectedRows);
+      } else {
+        let datas = this.$_.cloneDeep(
+          await getImpossible({
+            ...this.queryform,
+            page: 1,
+            size: -1
+          })
+        );
+        this.btnLoading = false
+        data = datas.data.data
+        if (!data.length) return;
+      }
+      
+      const tHeader = []
+      const filterVal = []
+      this.tableHeaders.forEach(v=>{
+        if(v.dataIndex){
+          tHeader.push(v.title)
+          filterVal.push(v.dataIndex)
+        }
+      })
+      export2Excel(
+        tHeader,
+        filterVal,
+        data,
+        "智能边缘物联网异常告警报表" + this.$moment().format("YYYYMMDDHHmmss")
+      );
+      this.btnLoading = false;
+    },
   },
 };
 </script>

portal-manager-ui/admin/src/views/dataAdmin/components/Impossible/index.vue

@@ -5,8 +5,9 @@
 				<a-button :loading="btnLoading" type="success" @click="handleExportTable">
 					<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
 				</a-button>
-				<div class="ml20">提交总次数：{{ numObj ? numObj.count : 0 }}次</div>
-				<div class="ml20">回复总次数：{{ numObj ? numObj.reply_count : 0 }}次</div>
+				<div class="ml20">提交总次数：<span style="color:#1890ff;font-weight: bold;">{{ numObj ? numObj.count : 0 }}次</span></div>
+				<div class="ml20">回复总次数：<span style="color:#1890ff;font-weight: bold;">{{ numObj ? numObj.reply_count : 0 }}次</span></div>
+				<div style="font-size:12px;color:#a19a9a;margin-left: 20px;">统计时间段：{{ queryform.time[0] }} ~ {{ queryform.time[1] }}</div>
 			</div>
 			<a-form :model="queryform" layout="inline">
 				<a-form-item>

portal-manager-ui/admin/src/views/dataAdmin/components/makeRecordReport/makeRecordReport.vue

@@ -204,6 +204,9 @@ export default {
         title: "预约时间",
         align: "center",
         dataIndex: "starttime",
+        customRender: (text,row) => {
+          return `${row.starttime}-${row.endtime}` || "--";
+        },
       },
       {
         title: "签到时间",
@@ -219,6 +222,11 @@ export default {
           return text.canceltime || "--";
         },
       },
+      {
+        title: "业务名称",
+        align: "center",
+        dataIndex: "business_name",
+      },
       {
         title: "创建时间",
         align: "center",

portal-manager-ui/admin/src/views/dataAdmin/components/makeRecordReport/recordReportdetails.vue

@@ -110,7 +110,7 @@
       <h2>
         <span>操作时间：{{ orderInfo.create_time }}</span>
         <span>预约方式：-- </span>
-        <span>操作站点：-- </span>
+        <span>操作站点：{{orderInfo.siteinfo?orderInfo.siteinfo.siteName:'--'}} </span>
       </h2>
     </div>
   </div>

portal-manager-ui/admin/src/views/dataAdmin/components/microOfficialWebsite/microForm.vue

@@ -103,10 +103,10 @@ let filterVal = [
   "openid",
   "nickname",
   "idcard_Sex",
-  "普通用户省份",
-  "普通用户城市",
+  "province",
+  "city",
   "create_time",
-  "是否实名认证",
+  "idcard_IDCardNo",
 ];
 export default {
   name: "microForm",
@@ -139,12 +139,14 @@ export default {
       {
         title: "普通用户省份",
         align: "center",
-        customRender: (text) => "--",
+        dataIndex: "province",
+        customRender: (text) => text || "--",
       },
       {
         title: "普通用户城市",
         align: "center",
-        customRender: (text) => "--",
+        dataIndex: "city",
+        customRender: (text) => text || "--",
       },
       {
         title: "用户头像",

portal-manager-ui/admin/src/views/dataAdmin/dataAdmin.vue

@@ -184,7 +184,6 @@ export default {
     // 查看数据
     handleCkeck(path) {
       if(path.indexOf('http')>-1){
-        alert(path)
         window.open(path)
       }else{
         this.$router.push(path);

portal-manager/pom.xml

@@ -17,9 +17,6 @@
 	<profiles>
 		<profile>
 			<id>develop</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
 			<properties>
 				<profiles.active>develop</profiles.active>
 				<profiles.queue.type>rabbitmq</profiles.queue.type>
@@ -39,6 +36,9 @@
 		</profile>
 		<profile>
 			<id>test</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
 			<properties>
 				<profiles.active>test</profiles.active>
 				<profiles.server.path>/zwfw</profiles.server.path>

portal-manager/src/main/java/com/mortals/xhx/module/page/web/PageInfoController.java

@@ -61,9 +61,10 @@ public class PageInfoController extends BaseCRUDJsonBodyMappingController<PageIn
                 model.put("data", result.getData().getData());
                 model.put("pageInfo", result.getData().getPageInfo());
                 model.put("dict", result.getData().getDict());
-            }
-
                 model.put("message_info", busiDesc + "成功");
+            }else {
+                model.put("message_info", result.getMsg());
+            }
             this.recordSysLog(this.request, busiDesc + " 【成功】");
         } catch (Exception var9) {
             code = -1;

portal-manager/src/main/resources/config/mybatis-sqlmap-config.xml

@@ -16,5 +16,7 @@
 			<property name="dialect" value="MySql" />
 			<property name="showSql" value="MySql" />
 		</plugin>
+		<plugin interceptor="com.mortals.framework.thirty.mybatis.LogInterceptor">
+		</plugin>
 	</plugins>
 </configuration>
\ No newline at end of file