Commit Graph

65 Commits

Author SHA1 Message Date
25ffc7adc7 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-12 15:45:55 +08:00
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
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-12 14:00:47 +08:00
lxj
5ad50d96b9 hik sdk 对接人脸抓拍 2025-07-12 13:52:44 +08:00
6246f897cb refactor(sis): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-12 11:15:51 +08:00
767551cb34 refactor(sis): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-12 10:43:31 +08:00
f11f199f51 refactor(sis): - 华为人脸对比改动
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-12 09:58:22 +08:00
34dc9d652b refactor(sis): - 华为人脸对比改动 2025-07-12 09:57:55 +08:00
421bc821eb refactor(sis): - E8同步
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-11 19:27:20 +08:00
493c0e641f refactor(sis): - E8同步 2025-07-11 17:57:17 +08:00
15683799673
be7002153c 授权逻辑更改
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 21s
2025-07-11 07:37:41 +08:00
6a7095ec58 refactor(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
- 同步删除华为盒子人像
 - 华为盒子人脸比对接口
2025-07-10 22:59:53 +08:00
7db6d2adac refactor(sis):
- 同步删除华为盒子人像
 - 华为盒子人脸比对接口
2025-07-10 22:58:42 +08:00
d70d99fb9a refactor(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
- 人员库业务逻辑调整
- 人像信息业务逻辑调整
- 华为盒子服务
2025-07-10 21:05:13 +08:00
lxj
815fe53f1a 增加梯控服务 2025-07-10 18:36:45 +08:00
15683799673
f98e94ecd1 增加电梯表 2025-07-10 08:45:01 +08:00
lxj
c7ff295d76 增加hik梯控操作 2025-07-09 18:10:52 +08:00
20f6cc8541 refactor(sis): base64指定格式JPG 2025-07-05 11:48:57 +08:00
9217befba8 refactor(sis): 1
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 7m43s
2025-07-05 10:07:46 +08:00
lxj
84de853d7c 人脸远程报警完成
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-02 17:54:54 +08:00
d300606070 refactor(sis): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-02 11:41:24 +08:00
6029392c7a refactor(sis): 将E8门禁设备 ID 类型从 Integer改为 Long 2025-07-02 11:20:35 +08:00
a065d72724 refactor(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
- E8平台授权逻辑调整
2025-07-01 21:17:22 +08:00
9a1a87800f feat(sis):
- 图像库图片改为通过ossId获取
- SisPersonLibImg 字段 imgUrl 更改为 imgOssId,类型同步更改
- 移除SisDeviceManage 中的 accessControlId 字段
2025-07-01 17:10:04 +08:00
15683799673
b70c3f2ee1 增加门禁查询树接口 2025-07-01 08:45:45 +08:00
75cc08fa99 驼峰变动
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-30 10:13:07 +08:00
15683799673
3837c2f2ef 增加门禁授权
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-30 06:17:21 +08:00
116abb4113 refactor(sis): E8授权逻辑更改
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-29 17:17:02 +08:00
abeac0c7c7 refactor(sis): 优化授权
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-29 16:19:26 +08:00
39f35fe58b feat(sis): 添加 E8平台对应关系模块
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-29 11:49:31 +08:00
15683799673
8b065703cd 增加门禁设备
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-29 02:59:43 +08:00
873cf303c2 feat(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
- 人像授权
 - 上传图片简化
2025-06-28 13:42:09 +08:00
3560c80c41 feat(sis):
- 修改人像图片
2025-06-28 10:23:42 +08:00
15683799673
0d8a4608ce 人像库图片完成
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-28 01:35:17 +08:00
15683799673
3721689ce7 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
# 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
e13230dc4e feat(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
- 人像图片与宇视平台同步操作(新增,删除),关联表同步写入/删除,可选同步至E8平台
2025-06-28 00:50:50 +08:00
9b2904ad06 feat(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
- 人像库操作与宇视平台同步操作(新增,删除),关联表同步写入/删除
- 人像图片与宇视平台同步操作(新增,删除),关联表同步写入/删除,可选同步至E8平台
- 关联关系改为id关联
2025-06-27 23:53:22 +08:00
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
3deaea69bb feat(sis):
- 人像库操作与宇视平台同步操作(新增,删除),关联表同步写入/删除
- 人像图片与宇视平台同步操作(新增,删除),关联表同步写入/删除,可选同步至E8平台
- 关联关系改为id关联
2025-06-27 23:13:34 +08:00
15683799673
7216b08530 人像库页面以及后端完成
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-27 22:18:14 +08:00
15683799673
e55ecffb98 java 实体类型long改int
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-27 20:28:33 +08:00
15683799673
f85f2a75e0 修改报错
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-27 17:54:38 +08:00
lxj
56b40bd5ad 人像库完成
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-27 17:13:01 +08:00
lxj
eba821a141 Merge branch 'master' of http://192.168.110.207:3000/by2025/SmartParks
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 8m34s
2025-06-26 22:02:09 +08:00
lxj
f2a1bdc0bf 页面修改 2025-06-26 22:01:48 +08:00
3100f8f54d feat(sis):
- 新增设备管理功能
- 添加设备与门禁的关联关系处理
2025-06-26 17:15:43 +08:00
lxj
4ba65e1034 Merge branch 'master' of http://192.168.110.207:3000/by2025/SmartParks
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 5m31s
2025-06-25 18:24:46 +08:00
lxj
d1de4bf845 添加SisDevicePointServiceImpl 2025-06-25 18:22:08 +08:00