216 Commits

Author	SHA1	Message	Date
dev_ljl	0cf20a8408	1、入驻单位状态修改	2025-07-14 10:14:18 +08:00
lxj	250d308a7f	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-13 17:45:26 +08:00
lxj	30f70fd08d	梯控对接	2025-07-13 17:43:02 +08:00
zcxlsm	25ffc7adc7	Merge remote-tracking branch 'origin/master'	2025-07-12 15:45:55 +08:00
zcxlsm	43171c2cac	refactor(sis): 华为盒子心跳保活	2025-07-12 15:45:36 +08:00
lxj	3e81ca335f	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-12 14:00:47 +08:00
lxj	5ad50d96b9	hik sdk 对接人脸抓拍	2025-07-12 13:52:44 +08:00
zcxlsm	6246f897cb	refactor(sis): 1	2025-07-12 11:15:51 +08:00
zcxlsm	767551cb34	refactor(sis): 1	2025-07-12 10:43:31 +08:00
zcxlsm	f11f199f51	refactor(sis): - 华为人脸对比改动	2025-07-12 09:58:22 +08:00
zcxlsm	34dc9d652b	refactor(sis): - 华为人脸对比改动	2025-07-12 09:57:55 +08:00
zcxlsm	421bc821eb	refactor(sis): - E8同步	2025-07-11 19:27:20 +08:00
zcxlsm	13eee82adc	Merge remote-tracking branch 'origin/master'	2025-07-11 17:57:34 +08:00
zcxlsm	493c0e641f	refactor(sis): - E8同步	2025-07-11 17:57:17 +08:00
yuyongle	7c9f400cfd	新增巡检功能	2025-07-11 17:30:18 +08:00
dy	1beae8d9af	修改不能按条件查询的bug	2025-07-11 11:15:28 +08:00
dy	8c6e6507df	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-11 10:07:04 +08:00
dy	0fe62c735c	修改备注不能为空的问题	2025-07-11 10:01:41 +08:00
15683799673	be7002153c	授权逻辑更改	2025-07-11 07:37:41 +08:00
zcxlsm	6a7095ec58	refactor(sis): ... - 同步删除华为盒子人像 - 华为盒子人脸比对接口	2025-07-10 22:59:53 +08:00
zcxlsm	7db6d2adac	refactor(sis): ... - 同步删除华为盒子人像 - 华为盒子人脸比对接口	2025-07-10 22:58:42 +08:00
zcxlsm	d70d99fb9a	refactor(sis): ... - 人员库业务逻辑调整 - 人像信息业务逻辑调整 - 华为盒子服务	2025-07-10 21:05:13 +08:00
lxj	2347d46a9b	Merge branch 'master' of http://192.168.110.207:3000/by2025/SmartParks	2025-07-10 18:36:58 +08:00
lxj	815fe53f1a	增加梯控服务	2025-07-10 18:36:45 +08:00
dy	6127223a78	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-10 14:50:22 +08:00
dy	f9ea62db04	1	2025-07-10 14:43:57 +08:00
yuyongle	4e60d1f3d1	修改工单类型bug	2025-07-10 14:30:34 +08:00
15683799673	f98e94ecd1	增加电梯表	2025-07-10 08:45:01 +08:00
yuyongle	2eab7e5242	新增工单类型表	2025-07-09 18:17:51 +08:00
yuyongle	ca962395f6	Merge remote-tracking branch 'origin/master'	2025-07-09 18:17:10 +08:00
lxj	302c4be55c	Merge branch 'master' of http://192.168.110.207:3000/by2025/SmartParks	2025-07-09 18:11:07 +08:00
lxj	c7ff295d76	增加hik梯控操作	2025-07-09 18:10:52 +08:00
yuyongle	7ccce852e9	新增工单类型表	2025-07-09 16:26:10 +08:00
yuyongle	52cffa205c	新增mapper注解	2025-07-09 13:46:30 +08:00
dy	8233524b2b	默认设置新增订单时为未退订	2025-07-09 13:17:40 +08:00
dy	74c7a809d9	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-09 13:08:13 +08:00
dy	a8b1254b96	实体类新增is_unbooking字段	2025-07-09 13:07:59 +08:00
yuyongle	eb1ec10c86	修改了会议预约记录列表bug	2025-07-09 12:38:05 +08:00
yuyongle	21c149bf0c	修改了会议预约记录bug	2025-07-09 09:16:54 +08:00
dy	e3e4e38f91	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-08 23:41:23 +08:00
dy	a5dae3530d	解决新增问题和根据id查询问题	2025-07-08 23:41:03 +08:00
yuyongle	f69326343e	修改了会议预约bug	2025-07-08 16:13:56 +08:00
dev_ljl	c49bb4cdb3	Merge remote-tracking branch 'origin/master'	2025-07-08 16:08:38 +08:00
dev_ljl	bb98a34fa6	1、	2025-07-08 16:08:19 +08:00
yuyongle	ba9202e6ca	修改了会议设置bug	2025-07-07 17:30:03 +08:00
yuyongle	7dc0a87a23	修改了会议设置bug	2025-07-07 17:20:28 +08:00
dy	1ca5352a9d	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-07 15:27:33 +08:00
dy	a349719de9	解决总价不能上传的问题	2025-07-07 15:27:21 +08:00
dev_ljl	7b40b084c1	1、绿植统计下单客户总数	2025-07-07 14:16:01 +08:00
dev_ljl	9a34602030	1、租赁订单	2025-07-05 17:38:27 +08:00
yuyongle	73b4581836	新增支付状态枚举接口	2025-07-05 15:54:34 +08:00
yuyongle	322a9944e8	新增支付状态枚举接口	2025-07-05 15:45:50 +08:00
bichangxiong	487480c0e1	更新 ruoyi-modules/Property/Dockerfile	2025-07-05 14:25:46 +08:00
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