 lishiwei
|
7e1693414b
|
feat(): 补充分支合并遗漏代码-2
|
2026-07-23 11:25:10 +08:00 |
 zhaokai
|
36ff847364
|
Merge branch 'dev_visual_page' into dev
# Conflicts:
# web-adapter/src/main/java/com/zcloud/key/project/web/project/KeyProjectController.java
# web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java
# web-app/src/main/java/com/zcloud/key/project/service/project/KeyProjectServiceImpl.java
# web-client/src/main/java/com/zcloud/key/project/api/project/KeyProjectServiceI.java
# web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/CameraInfoCO.java
# web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/CameraInfoDO.java
# web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectCameraMapper.java
# web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectMapper.java
# web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectCameraRepositoryImpl.java
# web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectRepositoryImpl.java
# web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/project/KeyProjectCameraRepository.java
# web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/project/KeyProjectRepository.java
# web-infrastructure/src/main/resources/mapper/KeyProjectCameraMapper.xml
# web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml
|
2026-07-21 14:00:05 +08:00 |
|
lishiwei
|
5f3d891cef
|
feat(): 补充分支合并遗漏代码
|
2026-07-20 09:10:30 +08:00 |
|
zhaokai
|
650c67e97b
|
feat(project): 添加可视化大屏重点作业统计功能
|
2026-07-17 17:31:12 +08:00 |
|
lishiwei
|
fbe0d77f45
|
feat(): 添加安全环保检查和隐患模块申辩功能
|
2026-07-09 09:04:07 +08:00 |
|
lishiwei
|
60d99fc026
|
feat(): 隐患列表查询条件维护、暂存不做校验
|
2026-07-07 17:01:05 +08:00 |
|
lishiwei
|
5f6f6ed9dc
|
feat(): 隐患处罚消息通知流程
|
2026-06-24 16:42:02 +08:00 |
|
lishiwei
|
fd2c464a42
|
feat(): 添加隐患处罚功能和重点作业处罚人员配置
|
2026-06-22 17:49:18 +08:00 |
|
lishiwei
|
f85d98241d
|
feat(): 添加项目创建来源字段（手动创建/自动创建）
|
2026-06-12 10:30:56 +08:00 |
|
lishiwei
|
91b0f36ffb
|
feat(): 支持重点作业属性类型多选和开工申请驳回功能
|
2026-06-11 17:46:21 +08:00 |
|
lishiwei
|
3179f7f644
|
Revert "feat(): 添加摄像头类型查询全部功能"
This reverts commit b60b1ef91a.
|
2026-06-11 10:49:22 +08:00 |
|
lishiwei
|
864d139081
|
Reapply "feat(): 添加摄像头类型查询全部功能"
This reverts commit 7c503bd0de.
|
2026-06-11 10:48:05 +08:00 |
|
lishiwei
|
7c503bd0de
|
Revert "feat(): 添加摄像头类型查询全部功能"
This reverts commit b60b1ef91a.
|
2026-06-11 10:45:11 +08:00 |
|
lishiwei
|
b60b1ef91a
|
feat(): 添加摄像头类型查询全部功能
|
2026-06-11 10:35:59 +08:00 |
zhangyue
|
1284a61eaa
|
添加消息通知和统计功能
|
2026-05-21 14:27:45 +08:00 |
 tianxinlei
|
018fb1e188
|
5-19 - 隐患表增加相关方相关字段 is_related/program_id/program_name；hidden/save接口相关增加字段：isRelated/programId/programName
|
2026-05-19 16:08:22 +08:00 |
|
zhangyue
|
290a606961
|
消息提醒
|
2026-05-14 19:02:09 +08:00 |
|
tianxinlei
|
cd65c72f42
|
5-14 - fix
|
2026-05-14 15:27:08 +08:00 |
|
zhaokai
|
add7230fd1
|
修改mapper
|
2026-04-29 13:57:14 +08:00 |
|
zhangyue
|
e8d2721188
|
完善隐患管理功能并新增菜单权限控制
|
2026-04-27 15:26:31 +08:00 |
|
zhangyue
|
320d648274
|
完善隐患管理功能并优化检查导出功能
|
2026-04-15 15:57:57 +08:00 |
|
zhangyue
|
ab7b7e0aad
|
添加AI告警批量处理功能并优化分页查询
|
2026-04-10 11:03:17 +08:00 |
|
zhangyue
|
b9f20a92a4
|
添加AI相关功能控制器和命令执行器
|
2026-04-10 08:48:25 +08:00 |
|
zhangyue
|
f62296ef2a
|
添加安全环保检查申辩详情查询和流程图功能
|
2026-04-02 16:33:24 +08:00 |
|
zhangyue
|
ad8633449a
|
添加隐患验收和整改功能
|
2026-04-01 11:49:37 +08:00 |
|
zhaokai
|
0a18d191e0
|
重点作业
|
2026-03-27 11:08:47 +08:00 |
|
zhangyue
|
d56aae21bb
|
安全环保检查增加核实、确认、申辩等功能
|
2026-03-27 09:57:31 +08:00 |
|
zhangyue
|
c5a655e5f7
|
安全环保检查
|
2026-03-23 08:59:37 +08:00 |
|
zhaokai
|
8c82151134
|
项目调整
|
2026-03-20 15:48:46 +08:00 |
|
zhaokai
|
f57e764d49
|
init
|
2026-03-19 15:33:41 +08:00 |
|
zhaokai
|
e5173a33f0
|
init
|
2026-03-19 15:32:45 +08:00 |
|
zhaokai
|
1df0fbdfb0
|
init
|
2026-03-16 10:13:33 +08:00 |