520 Commits

Author	SHA1	Message	Date
zcxlsm	1c23320f5a	Merge remote-tracking branch 'origin/master'	2025-08-07 12:06:33 +08:00
zcxlsm	9aa58d2027	feat(sdk): 添加通用API调用方法	2025-08-07 12:06:24 +08:00
dy	6023f35674	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-08-07 11:25:18 +08:00
dy	2deb9b96f9	1	2025-08-07 11:24:50 +08:00
yuyongle	20faf13328	修改了保洁bug	2025-08-07 09:39:08 +08:00
zcxlsm	3d6fa49e8f	Merge remote-tracking branch 'origin/master'	2025-08-06 20:37:29 +08:00
zcxlsm	2a6f258ae5	refactor(sis): - 将原有的单一外部通道号拆分为上键通道号和下键通道号	2025-08-06 20:36:00 +08:00
dy	29ba1ab5c6	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-08-06 16:48:15 +08:00
dy	66721b34cd	1	2025-08-06 16:47:46 +08:00
yuyongle	f0a7f2147f	修改了保洁bug	2025-08-06 16:40:20 +08:00
dev_ljl	2b19146c70	feat：工单类型不分页查询	2025-08-06 14:00:01 +08:00
zcxlsm	c78d90a316	Merge remote-tracking branch 'origin/master'	2025-08-06 12:46:14 +08:00
lxj	fedc381713	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks ... # Conflicts: # ruoyi-modules/Sis/src/main/java/org/dromara/sis/dubbo/RemotePrecautionaryImpl.java # ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlServiceImpl.java	2025-08-06 12:39:06 +08:00
lxj	70fe6d713a	增加设备和门禁的关联关系	2025-08-06 12:35:22 +08:00
zcxlsm	17d041e51d	feat(sis): 1	2025-08-06 12:03:06 +08:00
dy	5a92f9032e	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-08-06 11:37:54 +08:00
dy	0a18e0c1a6	排班按月份查询重构	2025-08-06 11:37:29 +08:00
dev_ljl	3fa1beca78	feat：工单类型树查询	2025-08-06 10:08:15 +08:00
mocheng	4acfdb6b35	访客接口	2025-08-06 10:02:11 +08:00
dev_ljl	00ad9a1330	feat：工单类型树查询	2025-08-06 09:50:50 +08:00
zcxlsm	a4e40f5123	feat(sis): ... - 新增 RocketMQ 消息队列配置和相关服务 - 实现远程开门接口和服务方法 - 更新梯控下发逻辑	2025-08-06 09:16:23 +08:00
zcxlsm	db58a91252	feat(sis): ... - 新增 RocketMQ 消息队列配置和相关服务 - 实现远程开门接口和服务方法 - 更新梯控下发逻辑	2025-08-06 09:14:07 +08:00
zcxlsm	f619c65261	Merge remote-tracking branch 'origin/master'	2025-08-05 16:35:46 +08:00
zcxlsm	a12ee50d08	feat(device): 增加设备绑定楼层信息	2025-08-05 16:35:00 +08:00
dy	b91201cf7f	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-08-05 16:27:13 +08:00
dy	86c28e95dd	访客pc端新增	2025-08-05 16:26:53 +08:00
zcxlsm	1288d27125	Merge remote-tracking branch 'origin/master'	2025-08-05 14:37:11 +08:00
zcxlsm	b7a4e512f0	feat(auth): 优化授权组相关功能	2025-08-05 14:36:57 +08:00
yuyongle	cb84447450	修改了资产bug	2025-08-05 12:15:13 +08:00
zcxlsm	bbe911119c	Merge remote-tracking branch 'origin/master'	2025-08-05 11:54:55 +08:00
zcxlsm	82740b7d62	refactor(sis): 冗余数据方便查询	2025-08-05 11:54:48 +08:00
dy	eb03629e84	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-08-05 11:22:04 +08:00
zcxlsm	c488f666d2	refactor(sis): 1	2025-08-05 11:15:25 +08:00
dy	6d9266ee21	排班不能获取id的bug	2025-08-05 11:07:16 +08:00
zcxlsm	2a36ddf688	refactor(huawei): 封装返回结果	2025-08-05 10:57:39 +08:00
zcxlsm	5d81537bdb	Merge remote-tracking branch 'origin/master'	2025-08-05 10:51:41 +08:00
zcxlsm	bbd895f116	refactor(sis): 1	2025-08-05 10:51:31 +08:00
mocheng	8093e1cfd7	访客&&大屏	2025-08-05 09:58:20 +08:00
mocheng	290780379d	Merge remote-tracking branch 'origin/master'	2025-08-05 09:38:50 +08:00
15683799673	59f8e0fc2f	人脸告警数据写入完成	2025-08-05 00:44:43 +08:00
15683799673	6b1519a5b6	人脸告警数据写入完成	2025-08-05 00:44:13 +08:00
dy	4316a25f6e	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-08-04 23:41:53 +08:00
dy	7b37ed293f	排班详情修改	2025-08-04 23:39:43 +08:00
zcxlsm	7c52b9b851	feat(elevator): 1	2025-08-04 23:30:51 +08:00
zcxlsm	0db07e6d53	refactor(property): 将 RemoteUnitService 调整为 RemoteBuildingService	2025-08-04 22:04:41 +08:00
lxj	26b609ea81	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-08-04 20:01:00 +08:00
lxj	58971070e9	同步代码	2025-08-04 20:00:51 +08:00
mocheng	0c34fedc8d	访客&&大屏	2025-08-04 19:59:48 +08:00
zcxlsm	15f97ac503	Merge remote-tracking branch 'origin/master'	2025-08-04 19:58:49 +08:00
zcxlsm	f1625b6e5f	feat(sis): 电梯⇄楼层⇄通道关联功能	2025-08-04 19:58:23 +08:00
lxj	291f9e7ffa	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-08-04 19:52:57 +08:00
lxj	1f4e168b56	同步代码	2025-08-04 19:50:46 +08:00
zcxlsm	00be7b4c47	refactor(property): 修改楼层查询接口	2025-08-04 19:13:26 +08:00
zcxlsm	1fcfa11608	Merge remote-tracking branch 'origin/master' ... # Conflicts: # ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/calback/HikAlarmCallBack.java	2025-08-04 19:10:54 +08:00
zcxlsm	cf5757c48f	refactor(property): 修改楼层查询接口	2025-08-04 19:08:41 +08:00
lxj	1d474d735e	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-08-04 19:04:31 +08:00
lxj	7f76de6073	增加无感通行业务逻辑	2025-08-04 19:04:20 +08:00
zcxlsm	4f58aa9c1e	refactor(sis): 1Vo 类，增加 DeviceInfo 内部类 ... - 注释掉 Sync	2025-08-04 16:52:30 +08:00
yuyongle	063b424b2b	修改了保洁bug	2025-08-04 14:28:30 +08:00
dy	f7db092af8	排班按月查询bug修改	2025-08-04 13:04:32 +08:00
dy	c104a71f76	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-08-04 10:11:16 +08:00
dy	f9fe218f7a	排班bug修改	2025-08-04 10:10:55 +08:00
yuyongle	c66c81b434	修改了工单管理bug	2025-08-04 09:09:34 +08:00
zcxlsm	6ede822c35	refactor(sis): 面板联动梯控 ... - 增加 Redis 缓存处理，避免重复下发权限 - 优化代码结构，提取公共方法 liftAuth	2025-08-03 18:05:56 +08:00
zcxlsm	bd742b9f16	refactor(sis): 帮助类优化	2025-08-03 17:43:08 +08:00
zcxlsm	5028649266	refactor(sis): 开启海康抓拍上报，比对通过后，梯控下发权限功能	2025-08-03 16:48:22 +08:00
zcxlsm	c8e199e68e	1	2025-08-03 14:41:49 +08:00
zcxlsm	8c463bfa66	refactor(job): 1	2025-08-03 14:38:55 +08:00
zcxlsm	131adee296	feat(task): 轮询下发电梯权限	2025-08-03 14:26:45 +08:00
zcxlsm	6e1c2e612b	refactor(job): 1	2025-08-02 16:36:32 +08:00
zcxlsm	f7cdf4bc09	refactor(sis): 定时授权任务通过snail-job触发	2025-08-02 15:50:40 +08:00
zcxlsm	c366a30488	refactor(property): 优化授权逻辑	2025-08-01 14:45:28 +08:00
zcxlsm	389ba82659	Merge remote-tracking branch 'origin/master'	2025-07-31 20:47:51 +08:00
zcxlsm	6c57942886	feat(sis): 解压指定编码GBK	2025-07-31 20:47:18 +08:00
lxj	dc3b6ab197	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-31 15:43:02 +08:00
lxj	e016e6d44c	同步通道任务完善	2025-07-31 15:38:04 +08:00
zcxlsm	9afeed3108	feat(sis): 重构智能设备通信模块	2025-07-31 15:12:24 +08:00
zcxlsm	7af0cee8e9	Merge remote-tracking branch 'origin/master'	2025-07-30 19:58:55 +08:00
zcxlsm	79f98b5387	refactor(property): 优化人员导入和人脸上传功能	2025-07-30 19:58:22 +08:00
dy	14b6077ea7	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-30 18:43:12 +08:00
dy	e69093390c	排班详情	2025-07-30 18:42:41 +08:00
lxj	8f71f5f261	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-30 18:41:47 +08:00
lxj	95dfc5ef9b	增加设备定时更新状态任务	2025-07-30 18:41:31 +08:00
dy	40a9cb65b8	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-30 16:18:15 +08:00
dy	6965b78db0	排班详情	2025-07-30 16:17:52 +08:00
yuyongle	17f342ed76	修改园区管理bug	2025-07-30 16:06:47 +08:00
yuyongle	f0beb7be5e	Merge remote-tracking branch 'origin/master'	2025-07-30 09:18:39 +08:00
zcxlsm	6938640419	feat(Sis): 1	2025-07-30 09:09:27 +08:00
lxj	7ef6d2ab47	设备通道逻辑修改	2025-07-30 05:58:21 +08:00
lxj	ef7ca1fa5a	设备通道逻辑修改	2025-07-30 05:46:35 +08:00
lxj	1b3fd18873	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-30 05:43:08 +08:00
zcxlsm	ec23e32ed6	feat(Sis): 删除入驻员工包括删除授权记录和人像库图片，并调用 E8 平台 API 删除客户信息	2025-07-29 23:22:35 +08:00
zcxlsm	b7fa3cd788	Merge remote-tracking branch 'origin/master'	2025-07-29 18:37:26 +08:00
zcxlsm	21985e48e7	fix(sis): 优化人脸照片同步和授权记录更新逻辑	2025-07-29 18:37:03 +08:00
yuyongle	9602ef96f7	修改园区管理bug	2025-07-29 17:27:56 +08:00
dy	d42e2c627f	班次id无法查询bug	2025-07-29 17:15:45 +08:00
dy	28143d17e7	详情bug	2025-07-29 16:59:17 +08:00
dy	b303ab6faa	新增固定班制主键重复修复	2025-07-29 15:47:40 +08:00
dy	da0ba9aa0a	抽取公共方法	2025-07-29 11:08:59 +08:00
dy	bff00b7b4a	新增排班问题处理	2025-07-29 11:06:29 +08:00
dy	64c3355e05	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-29 09:38:01 +08:00
dy	00b85990f4	修改	2025-07-29 09:37:11 +08:00
zcxlsm	4a73dd53ee	Merge remote-tracking branch 'origin/master'	2025-07-29 02:05:15 +08:00
zcxlsm	e3e26f46c1	feat(property): ... - 新增入驻员工导入功能，支持导入员工信息和人脸数据	2025-07-29 02:04:15 +08:00
lxj	0efbb1051e	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-28 20:27:35 +08:00
lxj	ad567ec13a	设备通道逻辑修改	2025-07-28 20:27:21 +08:00
mocheng	887b23e5ca	SOS同步	2025-07-28 17:04:22 +08:00
yuyongle	95b3be486a	修改园区管理bug	2025-07-28 17:00:27 +08:00
yuyongle	fe7620fac4	修改园区管理bug	2025-07-28 15:30:13 +08:00
mocheng	5274fb8d64	SOS同步	2025-07-28 01:01:25 +08:00
mocheng	cd9227be31	Merge remote-tracking branch 'origin/master'	2025-07-27 23:11:06 +08:00
dy	bee90b70d1	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-27 22:54:10 +08:00
dy	f92ef72238	1	2025-07-27 22:53:46 +08:00
mocheng	15b25144f0	SOS	2025-07-27 22:40:39 +08:00
zcxlsm	23e3100146	Merge remote-tracking branch 'origin/master'	2025-07-27 22:00:54 +08:00
zcxlsm	b857a2121b	refactor(sis): 1	2025-07-27 22:00:41 +08:00
dy	b3813dfe75	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-27 21:01:18 +08:00
dy	ae44ccb565	周期表不能插入bug及修改	2025-07-27 21:01:02 +08:00
zcxlsm	56dcc609d1	refactor(sis): 1	2025-07-27 19:53:57 +08:00
zcxlsm	4458432b5d	Merge remote-tracking branch 'origin/master'	2025-07-27 19:47:17 +08:00
zcxlsm	041db8c435	feat(sis): 添加模拟上下文登录功能	2025-07-27 19:47:05 +08:00
zcxlsm	1a900ad3db	feat(sis): 添加模拟上下文登录功能	2025-07-27 19:46:18 +08:00
yuyongle	7bdd9ff072	新增采购功能	2025-07-27 17:10:30 +08:00
dy	eb7d29640b	详情返回无打卡日期bug	2025-07-27 17:07:58 +08:00
dy	dd733fe5e2	数据无返回bug	2025-07-27 16:01:55 +08:00
dy	ff7bf241cb	1	2025-07-27 15:28:22 +08:00
dy	a043e18ba6	默认值	2025-07-27 15:22:50 +08:00
dy	751e65774f	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-27 15:03:21 +08:00
dy	2150602335	1	2025-07-27 15:01:43 +08:00
dy	f5159ab5f7	1	2025-07-27 14:43:13 +08:00
dy	cd2703080d	考勤组插入bug	2025-07-27 14:42:07 +08:00
dy	ca4d366d74	考勤组插入bug	2025-07-27 14:41:53 +08:00
zcxlsm	5ad0f652fe	refactor(auth): 权限组⇄设备关联功能完善	2025-07-26 23:25:22 +08:00
zcxlsm	f4dbcba15f	feat(sis): 实现人脸识别后远程开门功能（测试）	2025-07-26 22:32:26 +08:00
zcxlsm	47f389c560	Merge remote-tracking branch 'origin/master'	2025-07-26 17:54:17 +08:00
zcxlsm	127336af6d	refactor(sis): 定时任务逻辑	2025-07-26 17:53:57 +08:00
yuyongle	ba0c495c42	新增车辆管理功能	2025-07-26 17:53:48 +08:00
zcxlsm	d070a52487	Merge remote-tracking branch 'origin/master'	2025-07-26 02:37:23 +08:00
zcxlsm	3b7635bf1d	feat(auth): 人员授权相关功能修改	2025-07-26 02:37:02 +08:00
yuyongle	99336196e0	Merge remote-tracking branch 'origin/master'	2025-07-25 23:19:44 +08:00
lxj	d43b600e51	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-25 21:32:54 +08:00
lxj	d3517de7b6	流媒体服务接口逻辑更改	2025-07-25 21:32:43 +08:00
zcxlsm	b1fb876181	Merge remote-tracking branch 'origin/master'	2025-07-25 21:29:19 +08:00
zcxlsm	84e79b0414	feat(sis): 1	2025-07-25 21:29:08 +08:00
yuyongle	819105a470	修改了社区bug	2025-07-25 18:17:34 +08:00
dy	c0d43c01c6	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-25 10:28:21 +08:00
dy	6cc04a9cac	修改id传值	2025-07-25 10:26:31 +08:00
zcxlsm	2786cd9a7f	refactor(sdk): 初始化请求字段	2025-07-24 22:38:24 +08:00
zcxlsm	2a2df4e501	feat(Property): dubbo接口调用异常	2025-07-24 21:15:50 +08:00
zcxlsm	f2aafe220f	feat(sis): 新增个人门禁授权功能	2025-07-24 19:04:44 +08:00