by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
156 Commits 2 Branches 0 Tags 44 MiB
a349719de9
Commit Graph

156 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dy
a349719de9 解决总价不能上传的问题 2025-07-07 15:27:21 +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、租赁订单统计
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
Details
2025-07-02 17:58:52 +08:00
lxj
84de853d7c 人脸远程报警完成
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details
2025-07-02 17:54:54 +08:00
zcxlsm
d300606070 refactor(sis): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details
2025-07-02 11:41:24 +08:00
zcxlsm
bb94581a59 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details
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
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details
2025-07-02 10:39:47 +08:00
dy
ba5225f4c7 1 2025-07-02 10:39:36 +08:00
zcxlsm
a065d72724 refactor(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details 
- E8平台授权逻辑调整
 2025-07-01 21:17:22 +08:00
zcxlsm
baf9502b61 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details
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
49d512970d 依赖
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details
2025-07-01 15:15:16 +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
lxj
26be25d9cb 增加property-api模块
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details
2025-07-01 10:47:38 +08:00
15683799673
d2638de4e4 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
Details
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、绿植租赁订单
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details 
2、绿植租赁收费
3、绿植租赁订单养护
 2025-06-30 17:21:30 +08:00
zcxlsm
75cc08fa99 驼峰变动
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details
2025-06-30 10:13:07 +08:00
15683799673
3837c2f2ef 增加门禁授权
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details
2025-06-30 06:17:21 +08:00
15683799673
6ea6c79341 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
Details
2025-06-29 18:30:05 +08:00
15683799673
968200b4c0 1 2025-06-29 18:29:59 +08:00
zcxlsm
116abb4113 refactor(sis): E8授权逻辑更改
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details
2025-06-29 17:17:02 +08:00
zcxlsm
abeac0c7c7 refactor(sis): 优化授权
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details
2025-06-29 16:19:26 +08:00
zcxlsm
39f35fe58b feat(sis): 添加 E8平台对应关系模块
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details
2025-06-29 11:49:31 +08:00
15683799673
8b065703cd 增加门禁设备
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details
2025-06-29 02:59:43 +08:00
15683799673
6b1e9253af 综合管理模块完成
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details
2025-06-28 22:48:11 +08:00
zcxlsm
873cf303c2 feat(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details 
- 人像授权
 - 上传图片简化
 2025-06-28 13:42:09 +08:00
zcxlsm
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
Details
2025-06-28 02:41:55 +08:00
15683799673
0d8a4608ce 人像库图片完成
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details
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
Details 
# 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):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details 
- 人像图片与宇视平台同步操作（新增，删除），关联表同步写入/删除，可选同步至E8平台
 2025-06-28 00:50:50 +08:00
zcxlsm
9b2904ad06 feat(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details 
- 人像库操作与宇视平台同步操作（新增，删除），关联表同步写入/删除
- 人像图片与宇视平台同步操作（新增，删除），关联表同步写入/删除，可选同步至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 人像库页面以及后端完成
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details
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
Details
2025-06-27 20:28:33 +08:00
15683799673
f85f2a75e0 修改报错
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details
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
Details
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
Details
2025-06-27 17:13:01 +08:00