|
|
8f7a2c206e
|
bug修复
|
2025-09-05 11:29:57 +08:00 |
|
|
|
bc25c79962
|
bug修复
|
2025-09-03 16:47:58 +08:00 |
|
|
|
e6deadd6fe
|
bug修复
|
2025-09-02 17:04:35 +08:00 |
|
|
|
27182d10cc
|
青海中水北方修改
|
2025-08-27 15:19:43 +08:00 |
|
|
|
2bdd14aec2
|
bug修复
|
2025-08-22 19:47:15 +08:00 |
|
|
|
5b4b8a811c
|
Merge branch 'prod' into mod_security
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/project/enums/ProjectUfaceConfigSupplierTypeEnum.java
# src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerAttendanceController.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerAttendanceService.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendancePresenceServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionSyncService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionSyncServiceImpl.java
# src/main/java/com/zhgd/xmgl/task/WorkerTask.java
|
2025-08-21 18:56:44 +08:00 |
|
|
|
7a4acb5a45
|
智能安全帽人员每日工作统计相关和bug修改
|
2025-08-16 18:21:28 +08:00 |
|
|
|
4ea32fd92d
|
bug修改
|
2025-08-15 18:45:55 +08:00 |
|
|
|
d87e8aa639
|
安全隐患检查字段设置配置、隐患统计分析接口
|
2025-08-07 11:35:46 +08:00 |
|
|
|
1fceef032c
|
安全检查绑定多选的责任单位和区域、复查人、核验人，隐患统计分析接口
|
2025-08-05 13:57:09 +08:00 |
|
|
|
b05f69ebca
|
人脸设备对接
|
2025-07-31 11:07:51 +08:00 |
|
|
|
e7eef4e308
|
环境设备10分钟没有接收数据就离线，混凝土拌合站bug修复
|
2025-07-30 15:17:28 +08:00 |
|
|
|
b178980110
|
ICC的数据校验
|
2025-07-29 10:03:02 +08:00 |
|
|
|
d0a5adc391
|
mcs8的bug修改
|
2025-07-25 10:35:52 +08:00 |
|
|
|
3dee4efb53
|
Merge remote-tracking branch 'origin/uat' into uat
|
2025-07-24 18:31:01 +08:00 |
|
|
|
39415752dd
|
执法记录仪拉取时间更改
|
2025-07-24 18:30:43 +08:00 |
|
|
|
5641225773
|
Merge branch 'icc' into uat
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectServiceImpl.java
# src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
|
2025-07-24 10:35:10 +08:00 |
|
|
|
87f312ee98
|
icc的对接bug修改
|
2025-07-24 09:44:58 +08:00 |
|
|
|
c5b1d70097
|
Merge branch 'xjw_attendance' into uat
# Conflicts:
# pom.xml
# src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java
# src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRegionMapper.java
# src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml
# src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRegionService.java
# src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java
# src/main/java/com/zhgd/xmgl/util/Fileutils.java
|
2025-07-23 15:02:15 +08:00 |
|
|
|
6e0f08bfa9
|
人脸设备对接
|
2025-07-21 10:44:43 +08:00 |
|
|
|
f394535531
|
icc的劳务人员对接修改
|
2025-07-19 11:04:52 +08:00 |
|
|
|
67855c9ce2
|
icc的劳务人员和考勤提交
|
2025-07-16 18:10:59 +08:00 |
|
|
|
3212f171f5
|
定时2分钟获取人员定位标签报警数据任务bug修复
|
2025-07-16 11:41:01 +08:00 |
|
|
|
8d734b46f7
|
Merge branch 'xjw_attendance' into prod
|
2025-07-12 09:56:18 +08:00 |
|
|
|
389ffcd285
|
中水北方修改
|
2025-07-11 18:18:24 +08:00 |
|
|
|
c05541f1db
|
执法记录仪和工作票
提2
提3
提3
|
2025-07-05 18:08:31 +08:00 |
|
|
|
65338aecc9
|
对接小萨塔吊
|
2025-06-30 15:09:10 +08:00 |
|
|
|
321bf741f5
|
新金湾，新考勤app
|
2025-06-27 18:44:18 +08:00 |
|
|
|
549c6fd610
|
新金湾，新考勤
|
2025-06-25 10:22:40 +08:00 |
|
|
|
82cf215ab3
|
风险点、危险源、月度、隐患排查、排查执行
风险点、危险源、月度、隐患排查、排查执行
|
2025-06-13 18:28:46 +08:00 |
|
|
|
3c07e9e6a0
|
基建项目
|
2025-05-29 15:24:17 +08:00 |
|
|
|
9f839af8f8
|
模拟数据生成
|
2025-05-15 16:30:39 +08:00 |
|
|
|
a76a022cfd
|
弹弓人脸
|
2025-03-18 09:55:24 +08:00 |
|
|
|
1e0c93c0c7
|
上海电力人员定位
|
2025-03-14 10:27:27 +08:00 |
|
|
|
57c414b089
|
郑州水利调整
|
2025-03-12 09:20:41 +08:00 |
|
|
|
ce613b0b27
|
安徽合武项目BUG修复
|
2025-02-25 15:59:14 +08:00 |
|
|
|
de2916d8be
|
安徽合武项目需求增加
|
2025-02-25 11:01:14 +08:00 |
|
|
|
bebeab1176
|
盾构机优化
|
2025-02-24 10:40:00 +08:00 |
|
|
|
bb15bed6b9
|
盾构机优化
|
2025-02-21 16:28:02 +08:00 |
|
|
|
4806ed1b60
|
盾构机管理
|
2025-02-18 16:16:53 +08:00 |
|
|
|
fd6b3b6a89
|
盾构机管理
|
2025-02-14 18:20:56 +08:00 |
|
|
|
79a7af577b
|
安全帽调整(中北水利)
|
2024-12-13 17:43:19 +08:00 |
|
|
|
7bae930daa
|
注释监控截图功能
|
2024-11-06 16:47:07 +08:00 |
|
|
|
e3f44e6948
|
超速bug修改
|
2024-11-06 16:44:10 +08:00 |
|
|
|
8515a15ab1
|
定时rtsp流截图
|
2024-10-29 09:41:50 +08:00 |
|
|
|
3191e927b5
|
中铁项目定制
|
2024-10-22 12:50:14 +08:00 |
|
|
|
c2c38627d7
|
isc推数据到环境模块，污水取数据，车辆超速
|
2024-09-26 18:31:31 +08:00 |
|
|
|
ce242aa50e
|
优化
|
2024-09-26 18:24:56 +08:00 |
|
|
|
bcb952ad28
|
导出时长
|
2024-09-26 17:10:33 +08:00 |
|
|
|
9f995931c2
|
安全带接入
|
2024-09-20 16:43:52 +08:00 |
|
