Commit Graph

86 Commits

Author SHA1 Message Date
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
15683799673
6b1e9253af 综合管理模块完成
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-28 22:48:11 +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
62b1e1b803 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-28 02:41:55 +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
dy
b4f2dfd632 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-06-27 17:43:29 +08:00
dy
0e8cb20ffd 修改区域查询和新增保洁管理的问题 2025-06-27 17:42:40 +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
dy
c7446fde32 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 6m55s
2025-06-27 09:20:07 +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
dy
7bd6aa9977 处理新增保洁订单的问题 2025-06-26 21:59:24 +08:00
dy
72664a2966 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 7m14s
2025-06-26 17:33:38 +08:00
lxj
a1f4f0a112 修改保洁订单字段问题 2025-06-26 17:33:17 +08:00
a585a1be26 Merge remote-tracking branch 'origin/master'
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 7m10s
2025-06-26 17:16:00 +08:00
3100f8f54d feat(sis):
- 新增设备管理功能
- 添加设备与门禁的关联关系处理
2025-06-26 17:15:43 +08:00
lxj
d624566f7a 增加单元表 和 房间表 2025-06-26 16:11:24 +08:00
lxj
5a3ed5dd23 处理物业模块报错的问题
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 6m51s
2025-06-26 12:28:46 +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
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
44f102823c feat(sis): 凭证控制相关功能
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 10m8s
2025-06-25 18:08:08 +08:00
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
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 5m46s
# 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
7903749a8d Merge remote-tracking branch 'origin/master' 2025-06-25 18:04:06 +08:00
ee1896e59b feat(sis): 凭证控制相关功能 2025-06-25 18:03:52 +08:00
759dd5a5af Merge remote-tracking branch 'origin/master'
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 11m20s
2025-06-25 17:51:13 +08:00
0aad306035 1、绿植租赁 2025-06-25 17:50:27 +08:00
dy
8f523d7b16 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
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