|
|
06762a6e8a
|
优选多个提交
|
2025-11-04 16:51:41 +08:00 |
|
|
|
fe36de8bce
|
日志打印太多了改成debug
|
2025-11-04 16:47:29 +08:00 |
|
|
|
01e4c53cee
|
海康ai预警的事件码转int，可能大于int范围，需要截取后面9位
|
2025-10-28 15:30:05 +08:00 |
|
|
|
f7373aa125
|
isc的ai预警bug修复
|
2025-10-14 15:51:40 +08:00 |
|
|
|
200c25c5b4
|
isc的ai预警图片bug修复
|
2025-10-14 09:52:45 +08:00 |
|
|
|
047f7834af
|
的isc的回调接口的ai预警上传（event_aimms类型）
|
2025-10-13 17:38:14 +08:00 |
|
|
|
2adf8fc0f0
|
代码优化
|
2025-10-11 10:59:07 +08:00 |
|
|
|
f2f27114a8
|
mcs8下载选择的是http内网、外网
|
2025-09-19 16:49:04 +08:00 |
|
|
|
1c5e568e5b
|
mcu8的token失败重试
|
2025-09-17 11:38:29 +08:00 |
|
|
|
9e49c6f7bc
|
优化权限和bug修复
|
2025-09-10 20:26:17 +08:00 |
|
|
|
fc1c57457e
|
优化狮子王接口
|
2025-09-09 11:19:08 +08:00 |
|
|
|
48f41ef72a
|
广播和视频分组导入
|
2025-09-08 17:04:43 +08:00 |
|
|
|
8f7a2c206e
|
bug修复
|
2025-09-05 11:29:57 +08:00 |
|
|
|
8be282781f
|
Merge branch 'mod_security' into uat
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml
# src/main/java/com/zhgd/xmgl/modules/risk/controller/RiskListSourceController.java
# src/main/java/com/zhgd/xmgl/modules/risk/service/impl/RiskListSourceServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendancePresenceServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionSyncService.java
|
2025-09-04 11:36:54 +08:00 |
|
|
|
bc25c79962
|
bug修复
|
2025-09-03 16:47:58 +08:00 |
|
|
|
e6deadd6fe
|
bug修复
|
2025-09-02 17:04:35 +08:00 |
|
|
|
cdd918d0ef
|
bug修复
|
2025-08-28 16:49:47 +08:00 |
|
|
|
afdea2e5bb
|
bug修复
|
2025-08-27 17:47:11 +08:00 |
|
|
|
4ea32fd92d
|
bug修改
|
2025-08-15 18:45:55 +08:00 |
|
|
|
e0b1e446e6
|
uat合并prod
|
2025-08-13 16:00:38 +08:00 |
|
|
|
d87e8aa639
|
安全隐患检查字段设置配置、隐患统计分析接口
|
2025-08-07 11:35:46 +08:00 |
|
|
|
87ed00d464
|
SmartJavaAIOcr的bug修改
|
2025-08-05 15:19:57 +08:00 |
|
|
|
73a2fc37b2
|
SmartJavaAIOrc的bug修改
|
2025-08-05 15:18:40 +08:00 |
|
|
|
369847e9d3
|
接入SmartJavaAIOrc
|
2025-08-04 11:34:57 +08:00 |
|
|
|
395d2a1617
|
Merge branch 'ocr' into uat
|
2025-08-04 09:30:06 +08:00 |
|
|
|
ccf93552c0
|
短信配置
|
2025-07-29 18:17:51 +08:00 |
|
|
|
b178980110
|
ICC的数据校验
|
2025-07-29 10:03:02 +08:00 |
|
|
|
1b0fb0331b
|
ocr和施工日志
|
2025-07-25 18:07:45 +08:00 |
|
|
|
63eea7c798
|
icc修改bug
|
2025-07-25 15:53:37 +08:00 |
|
|
|
0f21141944
|
icc修改bug
|
2025-07-25 15:53:00 +08:00 |
|
|
|
d0a5adc391
|
mcs8的bug修改
|
2025-07-25 10:35:52 +08:00 |
|
|
|
fb963c2f56
|
mcs8的bug修改
|
2025-07-25 10:35:03 +08:00 |
|
|
|
60a4832eef
|
icc的错误重试
|
2025-07-25 09:46:49 +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 |
|
|
|
edcee38819
|
mcs8修改bug
|
2025-07-24 10:04:21 +08:00 |
|
|
|
db96864829
|
mcs8修改bug
|
2025-07-24 10:02:42 +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 |
|
|
|
f394535531
|
icc的劳务人员对接修改
|
2025-07-19 11:04:52 +08:00 |
|
|
|
67855c9ce2
|
icc的劳务人员和考勤提交
|
2025-07-16 18:10:59 +08:00 |
|
|
|
a8b76fd788
|
icc的劳务人员同步提交
|
2025-07-16 14:27:44 +08:00 |
|
|
|
896ff7ba47
|
icc提交
|
2025-07-15 11:20:42 +08:00 |
|
|
|
3a12d05af0
|
工作票bug修复和批量人员绑定设备
|
2025-07-11 17:28:09 +08:00 |
|
|
|
41b81aa2dd
|
工作票bug修复
|
2025-07-09 16:29:45 +08:00 |
|
|
|
c05541f1db
|
执法记录仪和工作票
提2
提3
提3
|
2025-07-05 18:08:31 +08:00 |
|
|
|
502d11cac6
|
海康ai获取区域入侵图片
|
2025-06-10 16:04:47 +08:00 |
|
|
|
381561f3a4
|
isc推数据到环境模块bug修复
|
2024-09-29 16:54:09 +08:00 |
|
|
|
c2c38627d7
|
isc推数据到环境模块，污水取数据，车辆超速
|
2024-09-26 18:31:31 +08:00 |
|
|
|
83cd00a69d
|
劳务在场清零bug修复
|
2024-08-28 15:20:58 +08:00 |
|
|
|
a3bc633163
|
通知也给项目级别账号来一份
|
2024-07-15 18:48:31 +08:00 |
|
