163 Commits

Author	SHA1	Message	Date
zcxlsm	5b45214bbe	Merge remote-tracking branch 'origin/master'	2025-07-05 11:49:09 +08:00
zcxlsm	20f6cc8541	refactor(sis): base64指定格式JPG	2025-07-05 11:48:57 +08:00
yuyongle	d09c0c7df8	新增会议室设置和会议室增值服务	2025-07-05 11:07:04 +08:00
zcxlsm	9217befba8	refactor(sis): 1	2025-07-05 10:07:46 +08:00
bichangxiong	2c6733d1ea	上传文件至 ruoyi-modules/Property	2025-07-04 18:03:29 +08:00
dev_ljl	014a157921	1、绿植租赁统计	2025-07-04 17:59:19 +08:00
yuyongle	79d55e458f	新增会议室设置和会议室增值服务	2025-07-04 14:57:15 +08:00
dy	398e19f2f7	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-03 12:05:10 +08:00
dy	4a20ec11db	保洁订单详情	2025-07-03 12:04:51 +08:00
dy	147c67b5ad	保洁订单详情	2025-07-03 09:36:04 +08:00
dev_ljl	9a8ccb1f57	1、租赁订单统计	2025-07-02 17:58:52 +08:00
lxj	84de853d7c	人脸远程报警完成	2025-07-02 17:54:54 +08:00
zcxlsm	d300606070	refactor(sis): 1	2025-07-02 11:41:24 +08:00
zcxlsm	bb94581a59	Merge remote-tracking branch 'origin/master'	2025-07-02 11:20:59 +08:00
zcxlsm	6029392c7a	refactor(sis): 将E8门禁设备 ID 类型从 Integer改为 Long	2025-07-02 11:20:35 +08:00
dy	3ff380ab50	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-02 10:39:47 +08:00
dy	ba5225f4c7	1	2025-07-02 10:39:36 +08:00
zcxlsm	a065d72724	refactor(sis): ... - E8平台授权逻辑调整	2025-07-01 21:17:22 +08:00
zcxlsm	baf9502b61	Merge remote-tracking branch 'origin/master'	2025-07-01 17:12:41 +08:00
zcxlsm	9a1a87800f	feat(sis): ... - 图像库图片改为通过ossId获取 - SisPersonLibImg 字段 imgUrl 更改为 imgOssId，类型同步更改 - 移除SisDeviceManage 中的 accessControlId 字段	2025-07-01 17:10:04 +08:00
dy	5ed4796d3c	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-01 15:13:48 +08:00
dy	2a2b400760	保洁逻辑修改	2025-07-01 15:13:38 +08:00
15683799673	d2638de4e4	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-01 08:46:07 +08:00
15683799673	b70c3f2ee1	增加门禁查询树接口	2025-07-01 08:45:45 +08:00
dy	1b158eb6ae	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks ... # Conflicts: # ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbBuildingVo.java	2025-06-30 20:09:22 +08:00
dy	b8ccb255d5	保洁查询和新增的问题	2025-06-30 20:05:58 +08:00
dy	7c95a690ea	保洁查询和新增的问题	2025-06-30 20:00:07 +08:00
dev_ljl	86503753bb	1、绿植租赁订单 ... 2、绿植租赁收费 3、绿植租赁订单养护	2025-06-30 17:21:30 +08:00
zcxlsm	75cc08fa99	驼峰变动	2025-06-30 10:13:07 +08:00
15683799673	3837c2f2ef	增加门禁授权	2025-06-30 06:17:21 +08:00
zcxlsm	116abb4113	refactor(sis): E8授权逻辑更改	2025-06-29 17:17:02 +08:00
zcxlsm	abeac0c7c7	refactor(sis): 优化授权	2025-06-29 16:19:26 +08:00
zcxlsm	39f35fe58b	feat(sis): 添加 E8平台对应关系模块	2025-06-29 11:49:31 +08:00
15683799673	8b065703cd	增加门禁设备	2025-06-29 02:59:43 +08:00
15683799673	6b1e9253af	综合管理模块完成	2025-06-28 22:48:11 +08:00
zcxlsm	873cf303c2	feat(sis): ... - 人像授权 - 上传图片简化	2025-06-28 13:42:09 +08:00
zcxlsm	3560c80c41	feat(sis): ... - 修改人像图片	2025-06-28 10:23:42 +08:00
15683799673	62b1e1b803	1	2025-06-28 02:41:55 +08:00
15683799673	0d8a4608ce	人像库图片完成	2025-06-28 01:35:17 +08:00
15683799673	3721689ce7	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks ... # Conflicts: # ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibImgBo.java # ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibImgVo.java # ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibImgServiceImpl.java # ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibServiceImpl.java	2025-06-28 01:33:02 +08:00
15683799673	a259305f90	人像库图片完成	2025-06-28 01:28:31 +08:00
15683799673	18f37be0d5	人像库图片完成	2025-06-28 01:27:04 +08:00
zcxlsm	e13230dc4e	feat(sis): ... - 人像图片与宇视平台同步操作（新增，删除），关联表同步写入/删除，可选同步至E8平台	2025-06-28 00:50:50 +08:00
zcxlsm	9b2904ad06	feat(sis): ... - 人像库操作与宇视平台同步操作（新增，删除），关联表同步写入/删除 - 人像图片与宇视平台同步操作（新增，删除），关联表同步写入/删除，可选同步至E8平台 - 关联关系改为id关联	2025-06-27 23:53:22 +08:00
zcxlsm	4fb1de5a9b	Merge remote-tracking branch 'origin/master' ... # Conflicts: # ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CodePrefixConstants.java # ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibDeviceRef.java # ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceImgRefBo.java # ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceRefBo.java # ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibImgBo.java # ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceImgRefVo.java # ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceRefVo.java # ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisLibDeviceRefService.java # ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibDeviceRefServiceImpl.java # ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibImgServiceImpl.java # ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibServiceImpl.java	2025-06-27 23:44:10 +08:00
zcxlsm	3deaea69bb	feat(sis): ... - 人像库操作与宇视平台同步操作（新增，删除），关联表同步写入/删除 - 人像图片与宇视平台同步操作（新增，删除），关联表同步写入/删除，可选同步至E8平台 - 关联关系改为id关联	2025-06-27 23:13:34 +08:00
15683799673	7216b08530	人像库页面以及后端完成	2025-06-27 22:18:14 +08:00
15683799673	e55ecffb98	java 实体类型long改int	2025-06-27 20:28:33 +08:00
15683799673	f85f2a75e0	修改报错	2025-06-27 17:54:38 +08:00
dy	b4f2dfd632	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-06-27 17:43:29 +08:00
dy	0e8cb20ffd	修改区域查询和新增保洁管理的问题	2025-06-27 17:42:40 +08:00
lxj	56b40bd5ad	人像库完成	2025-06-27 17:13:01 +08:00
dy	c7446fde32	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-06-27 09:20:07 +08:00
lxj	eba821a141	Merge branch 'master' of http://192.168.110.207:3000/by2025/SmartParks	2025-06-26 22:02:09 +08:00
lxj	f2a1bdc0bf	页面修改	2025-06-26 22:01:48 +08:00
dy	7bd6aa9977	处理新增保洁订单的问题	2025-06-26 21:59:24 +08:00
dy	72664a2966	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-06-26 17:33:38 +08:00
lxj	a1f4f0a112	修改保洁订单字段问题	2025-06-26 17:33:17 +08:00
zcxlsm	a585a1be26	Merge remote-tracking branch 'origin/master'	2025-06-26 17:16:00 +08:00
zcxlsm	3100f8f54d	feat(sis): ... - 新增设备管理功能 - 添加设备与门禁的关联关系处理	2025-06-26 17:15:43 +08:00
lxj	d624566f7a	增加单元表 和 房间表	2025-06-26 16:11:24 +08:00
lxj	5a3ed5dd23	处理物业模块报错的问题	2025-06-26 12:28:46 +08:00
lxj	4ba65e1034	Merge branch 'master' of http://192.168.110.207:3000/by2025/SmartParks	2025-06-25 18:24:46 +08:00
lxj	d1de4bf845	添加SisDevicePointServiceImpl	2025-06-25 18:22:08 +08:00
lxj	6b6968994d	删除dimp-wy-web	2025-06-25 18:20:44 +08:00
lxj	6452e85012	删除dimp-wy-web	2025-06-25 18:20:40 +08:00
zcxlsm	44f102823c	feat(sis): 凭证控制相关功能	2025-06-25 18:08:08 +08:00
zcxlsm	98bfc7835d	Merge remote-tracking branch 'origin/master'	2025-06-25 18:06:11 +08:00
lxj	1fbef5386e	Merge branch 'master' of http://192.168.110.207:3000/by2025/SmartParks ... # Conflicts: # ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDevicePointVo.java	2025-06-25 18:04:41 +08:00
lxj	3fb9a76876	增加人像库	2025-06-25 18:04:09 +08:00
zcxlsm	7903749a8d	Merge remote-tracking branch 'origin/master'	2025-06-25 18:04:06 +08:00
zcxlsm	ee1896e59b	feat(sis): 凭证控制相关功能	2025-06-25 18:03:52 +08:00
dev_ljl	759dd5a5af	Merge remote-tracking branch 'origin/master'	2025-06-25 17:51:13 +08:00
dev_ljl	0aad306035	1、绿植租赁	2025-06-25 17:50:27 +08:00
dy	8f523d7b16	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-06-25 17:36:36 +08:00
dy	25774259b9	人员组管理实现	2025-06-25 17:36:25 +08:00
dy	2753a01842	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks ... # Conflicts: # ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties	2025-06-25 17:05:04 +08:00
zcxlsm	42c615a187	feat(sis): 凭证控制相关功能	2025-06-25 17:04:13 +08:00
dy	f615486c55	区域组管理实现	2025-06-25 17:03:05 +08:00
zcxlsm	d5981b0d4a	feat(sis): 新增凭证控制相关功能 ... - 新增发行凭证、批量发行凭证、操作凭证、换卡补卡、注销人员凭证等功能 - 实现凭证控制相关的API接口和控制器	2025-06-25 15:41:32 +08:00
zcxlsm	bd3ab40be6	E8门禁业务	2025-06-25 12:54:08 +08:00
lxj	84efbe0e11	E8门禁业务	2025-06-25 12:47:23 +08:00
lxj	6de67e1956	Merge branch 'master' of http://192.168.110.207:3000/by2025/SmartParks	2025-06-25 12:22:51 +08:00
lxj	71ba316e91	增加门禁设备管理	2025-06-25 12:21:11 +08:00
mocheng	5603edb1fc	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-06-25 11:40:34 +08:00
mocheng	7e60d2a3cc	资产审批	2025-06-25 11:40:21 +08:00
lxj	d8d01b7d38	修改mapper 包名	2025-06-25 10:25:15 +08:00
mocheng	9b4fafeec2	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-06-25 09:26:39 +08:00
mocheng	e5145002a4	asset模块	2025-06-25 09:26:28 +08:00
15683799673	27425e32af	1 增加人像库等操作 ... 2 修改包名称	2025-06-25 00:40:14 +08:00
15683799673	35cbd74b39	1 增加人像库等操作 ... 2 修改包名称	2025-06-25 00:38:53 +08:00
15683799673	1a51f90731	E8服务合并到安放模块	2025-06-24 22:06:47 +08:00
15683799673	0b5555ed65	E8服务合并到安放模块	2025-06-24 22:04:26 +08:00
zcxlsm	9d4a58e0aa	feat(E8Service): 新增门禁设备管理功能 ... - 添加门禁设备相关实体类和请求/响应对象 - 实现门禁设备管理的接口和服务类 - 集成E8 API工具类，用于调用第三方接口- 新增查询、分页查询、添加、修改和删除门禁设备的方法	2025-06-24 21:24:25 +08:00
zcxlsm	c85ec85b2d	feat(E8Service): 新增门禁控制和人员信息管理功能- 添加 AccessControlController、AccessControlService 和 AccessControlServiceImpl 类实现门禁控制功能 ... - 新增 CustomerService 和 CustomerServiceImpl 类提供人员信息管理服务 - 创建相关请求和响应对象类，如 RemoteOpenDoorReq、AccessRecordFindRes等 - 添加 E8ApiUtil 工具类处理与第三方 API 的交互 - 新增 AreaTypeEnum 枚举类表示区域类型	2025-06-24 21:18:42 +08:00
lxj	d4927d2699	增加宇视AI盒子对接服务 ... iot模块修改为智能安防模块	2025-06-24 21:09:01 +08:00
mocheng	afbfc9d7fe	保洁订单状态，资产类型	2025-06-24 17:00:39 +08:00
dy	187690125c	会议室和访客管理模块	2025-06-23 10:02:35 +08:00
mocheng	a55a001b75	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-06-23 09:29:31 +08:00
mocheng	bfb4a7dfae	新增多个功能模块	2025-06-23 09:29:10 +08:00