529 Commits

Author	SHA1	Message	Date
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
zcxlsm	a1942c34cb	Merge remote-tracking branch 'origin/master'	2025-07-24 11:20:40 +08:00
zcxlsm	399f48f1b4	feat(auth-group): 新增授权组门禁和电梯关联功能	2025-07-24 11:20:19 +08:00
mocheng	eaef24b3b7	app功能列表	2025-07-24 11:07:28 +08:00
yuyongle	c49bc001bb	修改了社区bug	2025-07-24 10:58:17 +08:00
yuyongle	81ebb3e8c1	修改了社区bug	2025-07-24 10:20:38 +08:00
yuyongle	31291b4413	增加工单看板功能	2025-07-23 20:52:32 +08:00
dy	a24c9dce47	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-23 19:28:14 +08:00
dy	2631febd2a	新增时间的问题	2025-07-23 19:27:43 +08:00
zcxlsm	8ae12277d8	Merge remote-tracking branch 'origin/master'	2025-07-23 17:32:11 +08:00
zcxlsm	1124b832ac	feat(sis): 添加权限组⇄设备关联功能	2025-07-23 17:30:27 +08:00
dy	919d0937cd	考勤组bug修改	2025-07-23 17:13:41 +08:00
dy	1388e918c3	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-23 16:20:57 +08:00
dy	5da0665092	考勤组bug修改	2025-07-23 16:20:25 +08:00
yuyongle	e026c73627	修改了会议记录bug	2025-07-23 15:20:06 +08:00
yuyongle	99c15c311f	修改了会议记录bug	2025-07-23 15:01:21 +08:00
zcxlsm	2c8d32f945	feat(property): 添加权限组字段	2025-07-23 13:15:13 +08:00
zcxlsm	d540a37543	feat(sis): 更新授权组相关实体	2025-07-23 13:09:30 +08:00
zcxlsm	5d2aa88690	feat(sis): 添加授权组管理功能	2025-07-23 10:54:33 +08:00
yuyongle	350b8f511c	新增客户服务功能	2025-07-23 09:28:20 +08:00
yuyongle	359e73fa97	新增客户服务功能	2025-07-22 20:53:33 +08:00
lxj	9ac415d6fc	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-22 19:25:18 +08:00
lxj	67bf690c8a	流媒体服务接口逻辑更改	2025-07-22 19:25:09 +08:00
dy	ab9fc43996	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-22 15:49:47 +08:00
dy	c289a25829	日历的具体考勤和班次信息	2025-07-22 15:49:18 +08:00
zcxlsm	1c64023502	Merge remote-tracking branch 'origin/master'	2025-07-22 11:40:20 +08:00
zcxlsm	b95f99532f	feat(sis): 电梯授权增加楼层选择功能	2025-07-22 11:40:00 +08:00
mocheng	77b345e017	sso	2025-07-22 10:13:14 +08:00
lxj	c9c6f229bd	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-21 21:02:13 +08:00
lxj	2d1b6d8ff7	视频监控逻辑完善	2025-07-21 21:01:17 +08:00
15683799673	9fc7fb0fde	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-21 21:00:50 +08:00
15683799673	ed091501d7	增加按需取流接口	2025-07-21 21:00:40 +08:00
yuyongle	1e9efc77ed	修改了工单bug	2025-07-21 20:56:46 +08:00
yuyongle	0b90663d3d	修改了工单bug	2025-07-21 14:37:15 +08:00
dy	f3973d2595	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks ... # Conflicts: # pom.xml	2025-07-21 10:07:51 +08:00
dy	34d7b40645	时间格式化问题	2025-07-21 10:04:56 +08:00
15683799673	800a2de30f	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks ... # Conflicts: # pom.xml # ruoyi-modules/Property/pom.xml	2025-07-21 03:37:26 +08:00
15683799673	365ca2d7bc	物业模块删除厂商 ... 安防模块增加厂商 设备模块逻辑优化	2025-07-21 03:36:07 +08:00
zcxlsm	a198e0c720	fix(property):	2025-07-20 19:23:22 +08:00
zcxlsm	f45442e954	Merge remote-tracking branch 'origin/master'	2025-07-20 15:02:02 +08:00
zcxlsm	63b96a79d6	fix(property):	2025-07-20 15:01:54 +08:00
yuyongle	e6c3c7d88a	修改了费用bug	2025-07-20 14:52:38 +08:00
zcxlsm	426717e9cc	feat(sis): 新增智能照明控制功能	2025-07-20 14:24:30 +08:00
zcxlsm	498209cb87	feat(sdk): 添加电表和水表通信工具类	2025-07-20 14:01:54 +08:00
dy	f24df2e494	依赖冲突	2025-07-20 10:32:06 +08:00
dy	0c0ecf8f93	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-19 17:15:01 +08:00
dy	8c4748c9a3	修复排班bug	2025-07-19 17:12:58 +08:00
dy	e4c21c831b	修复排班bug	2025-07-19 17:10:57 +08:00
zcxlsm	073e235179	refactor(property): 1	2025-07-19 16:55:27 +08:00
zcxlsm	98fb035a97	refactor(property): meter_type字典转换	2025-07-19 16:21:55 +08:00
zcxlsm	eb5efd9a6c	refactor(property): 1	2025-07-19 13:52:02 +08:00
zcxlsm	5a88e94c23	refactor(property): 水电气表字段更改	2025-07-19 13:42:03 +08:00
zcxlsm	b4228c0425	feat(property): 添加仪表抄记功能	2025-07-19 12:38:54 +08:00
dy	49ec73df49	1	2025-07-19 09:52:37 +08:00
15683799673	adafd52d0f	修改安防设备管理模块逻辑	2025-07-19 09:10:20 +08:00
yuyongle	aa5b0b9478	修改了费用bug	2025-07-18 20:57:02 +08:00
yuyongle	6163532f39	修改了费用bug	2025-07-18 17:48:04 +08:00
lxj	b7d225c107	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-18 15:13:31 +08:00
lxj	305705abc0	增加海康摄像头上报事件	2025-07-18 15:13:18 +08:00
dy	625be80cf2	1	2025-07-18 11:07:22 +08:00
dy	5d042a2151	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-18 10:10:48 +08:00
dy	75292374fa	排班	2025-07-18 10:04:38 +08:00
dy	72b3e40124	排班	2025-07-18 10:03:44 +08:00
dy	d8dfde621e	排班	2025-07-18 10:03:20 +08:00
yuyongle	9c0591dfaa	Merge remote-tracking branch 'origin/master'	2025-07-18 09:22:10 +08:00
yuyongle	9f2c4658a0	新增费用功能	2025-07-18 09:21:44 +08:00
zcxlsm	e07f690002	refactor(sis): 整合E8相关接口	2025-07-17 19:54:57 +08:00
zcxlsm	ec2d00ac72	refactor(sis): 1	2025-07-17 16:39:37 +08:00
zcxlsm	894cb912f0	refactor(sis): 1	2025-07-17 16:22:16 +08:00
zcxlsm	f35a15fc23	refactor(sis): 字段更改	2025-07-17 14:49:38 +08:00
zcxlsm	e1f716c70b	refactor(property): ... - 水电气表业务、厂商业务移动至物业模块	2025-07-17 13:12:11 +08:00
zcxlsm	3f97caad42	refactor(property): ... - 水电气表业务、厂商业务移动至物业模块	2025-07-17 12:38:58 +08:00
zcxlsm	177bbe5a8f	refactor(sis): - 电梯⇄楼层关联表字段变动	2025-07-17 11:56:35 +08:00
lxj	f866e2ffc6	hik-sdk jna 版本升级	2025-07-17 02:11:58 +08:00
zcxlsm	7928aa16f8	Merge remote-tracking branch 'origin/master'	2025-07-16 22:01:53 +08:00
zcxlsm	43933c83c5	feat(property): floor	2025-07-16 22:01:36 +08:00
dy	f16a9e0897	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-16 19:15:46 +08:00
dy	63dd804ced	固定班制的新增业务	2025-07-16 19:15:27 +08:00
yuyongle	dbf9346953	新增设备管理功能	2025-07-16 17:40:37 +08:00
zcxlsm	8dbb2aab9d	refactor(sis): 楼层下发权限修改	2025-07-16 11:18:07 +08:00
zcxlsm	c2c0d1ffb4	refactor(sis): 楼层下发权限修改	2025-07-16 11:16:55 +08:00
zcxlsm	3511a0b8c1	Merge remote-tracking branch 'origin/master'	2025-07-16 10:13:29 +08:00
zcxlsm	ed97e7cefb	feat(property): ... - 新增查询所有楼层和根据单元ID查询楼层的功能 - 在新增楼层时增加同一单元楼层重复校验	2025-07-16 10:12:24 +08:00
dy	365ec14925	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-16 09:45:45 +08:00
dy	978c1f6f9e	新增状态常量使用	2025-07-16 09:45:29 +08:00
zcxlsm	2c794447d8	refactor(sis): ... - 移除建筑物楼层信息相关代码，从物业模块引入	2025-07-16 09:42:28 +08:00
15683799673	bbb80f3a63	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-16 02:36:48 +08:00
15683799673	9c5cd99a54	增加视频模块相关代码	2025-07-16 02:36:26 +08:00
15683799673	fa28f2d351	增加视频模块相关代码	2025-07-16 02:35:44 +08:00
dy	47c35c603c	修改班次管理业务逻辑	2025-07-15 22:42:05 +08:00
zcxlsm	fdc70aec0a	feat(sis): ... - 新增楼层信息相关操作 - 新增电梯⇄楼层关联信息相关操作 - 梯控流程补全	2025-07-15 18:45:48 +08:00
dy	94b0156479	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-15 15:17:08 +08:00