|
|
59339cc59e
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang
# Conflicts:
# src/main/java/com/zhgd/xmgl/async/AsyncAiAnalyse.java
# src/main/java/com/zhgd/xmgl/modules/frontier/controller/FrontierProtectionDevAlarmController.java
# src/main/java/com/zhgd/xmgl/modules/frontier/service/IFrontierProtectionDevAlarmService.java
# src/main/java/com/zhgd/xmgl/modules/frontier/service/impl/FrontierProtectionDevAlarmServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/frontier/service/impl/FrontierProtectionDevServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/project/service/impl/EnableMessageDevRuleServiceImpl.java
# src/main/java/com/zhgd/xmgl/task/MessageDevRuleTask.java
# src/main/java/com/zhgd/xmgl/task/VideoTask.java
|
2025-10-25 16:47:02 +08:00 |
|
|
|
74f9894f7c
|
规则报警和异步线程池优化2
|
2025-10-25 16:41:35 +08:00 |
|
|
|
f2b1bb62f7
|
规则报警和异步线程池优化
|
2025-10-24 17:56:25 +08:00 |
|
|
|
97f36b579d
|
视频监控在线状态改为3分钟更新一次
|
2025-10-23 17:44:30 +08:00 |
|
|
|
d8616fa68d
|
操作工作票优化
|
2025-10-23 17:37:07 +08:00 |
|
|
|
4dcd0596a2
|
拉取视频文件加上施工场站名称s
|
2025-10-23 16:21:26 +08:00 |
|
|
|
9da505964a
|
合并解决冲突或升级jdk17语法
|
2025-10-23 10:40:52 +08:00 |
|
|
|
f5060c81a1
|
登录null修复
|
2025-10-22 18:20:47 +08:00 |
|
|
|
76c7de5d3a
|
合并解决冲突或升级jdk17语法
|
2025-10-22 18:19:34 +08:00 |
|
|
|
44b04db1e9
|
登录null修复
|
2025-10-22 18:14:33 +08:00 |
|
|
|
dad273b0a4
|
临边防护app接口
|
2025-10-22 18:14:11 +08:00 |
|
|
|
afb8f322d6
|
执法记录仪不要从mcs8拉取视频类型的
|
2025-10-21 18:30:33 +08:00 |
|
|
|
5754bec261
|
各专业隐患小类风险走势图bug修复
|
2025-10-21 15:10:37 +08:00 |
|
|
|
a3a10e513a
|
天气appid更新
|
2025-10-21 14:51:01 +08:00 |
|
|
|
35434ada14
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang
|
2025-10-20 18:22:53 +08:00 |
|
|
|
48454441f5
|
总企业加入省市区
|
2025-10-20 17:23:50 +08:00 |
|
|
|
5f506f5a38
|
AI识别修改
|
2025-10-20 17:10:17 +08:00 |
|
|
|
8b3594803e
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang
|
2025-10-17 20:06:57 +08:00 |
|
|
|
f40cee4848
|
HikVideoUtil加上@Component
|
2025-10-17 20:05:52 +08:00 |
|
|
|
ac68011c81
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang
|
2025-10-17 18:54:46 +08:00 |
|
|
|
328bc4b0d5
|
批量复制默认工种数据到某个项目bug修复
|
2025-10-17 18:54:29 +08:00 |
|
|
|
6199555729
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang
|
2025-10-17 18:48:44 +08:00 |
|
|
|
76694a1b17
|
查询企业的树形项目和监控分组和监控列表和云端根据条件删除执法记录仪文件信息
|
2025-10-17 18:48:18 +08:00 |
|
|
|
8c228f1495
|
替换wss
|
2025-10-17 18:47:14 +08:00 |
|
|
|
32913ad718
|
工作票bug修复
|
2025-10-17 18:46:38 +08:00 |
|
|
|
a5b9ef2dbd
|
合并解决冲突或升级jdk17语法
|
2025-10-17 14:49:38 +08:00 |
|
|
|
03a64da51a
|
配置填错了
|
2025-10-16 17:03:06 +08:00 |
|
|
|
0eb84d4cf6
|
合并解决冲突或升级jdk17语法
|
2025-10-16 16:57:07 +08:00 |
|
|
|
d4bd514d9a
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang
# Conflicts:
# pom.xml
|
2025-10-16 16:55:13 +08:00 |
|
|
|
268d6bbdd6
|
ocr的SmartJavaAI离线
|
2025-10-16 16:44:41 +08:00 |
|
|
|
111e1962ba
|
合并升级jdk17语法
|
2025-10-15 18:12:09 +08:00 |
|
|
|
d15c62efd0
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterWorkCycleServiceImpl.java
# src/main/java/com/zhgd/xmgl/util/MockUtil.java
# src/main/resources/application-gsx-other-env-show.properties
|
2025-10-15 18:10:27 +08:00 |
|
|
|
443b6e6f3c
|
大屏项目点位配置
|
2025-10-15 16:13:04 +08:00 |
|
|
|
0300705243
|
dunhuan-jdk8配置
|
2025-10-15 16:11:57 +08:00 |
|
|
|
b4dd77eb9e
|
mock
|
2025-10-15 10:34:39 +08:00 |
|
|
|
efc4dca17e
|
大屏bug修复
|
2025-10-15 10:34:22 +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 |
|
|
|
7d249778b2
|
Merge branch 'uat' into dunhuang
|
2025-10-11 17:03:10 +08:00 |
|
|
|
d3438c520e
|
允许html上传
|
2025-10-11 17:02:53 +08:00 |
|
|
|
3e8cbdc6a3
|
合并升级jdk17语法
|
2025-10-11 17:02:02 +08:00 |
|
|
|
1e0975255a
|
Merge branch 'uat' into dunhuang
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/machinedevice/controller/MachineDeviceLargeController.java
# src/main/java/com/zhgd/xmgl/modules/machinedevice/controller/MachineDeviceLargeEntryInspectCheckController.java
# src/main/java/com/zhgd/xmgl/modules/machinedevice/controller/MachineDeviceLargeEntryInspectCheckRecordController.java
# src/main/java/com/zhgd/xmgl/modules/machinedevice/controller/MachineDeviceLargeEntryInspectTableController.java
# src/main/java/com/zhgd/xmgl/modules/machinedevice/controller/MachineDeviceLargeEntryInspectTableRecordController.java
# src/main/java/com/zhgd/xmgl/modules/policecamera/controller/PoliceCameraItemController.java
|
2025-10-11 16:59:10 +08:00 |
|
|
|
65c4b09c7b
|
bindTicket查询修复
|
2025-10-11 16:55:15 +08:00 |
|
|
|
2adf8fc0f0
|
代码优化
|
2025-10-11 10:59:07 +08:00 |
|
|
|
64b9f1ba55
|
企业或项目资料中心接口
|
2025-10-11 10:47:35 +08:00 |
|
|
|
84c3ff4542
|
机械设备导入导出
|
2025-10-10 17:21:10 +08:00 |
|
|
|
2227f942bf
|
规范添加安全检查记录信息时间
|
2025-10-10 17:00:19 +08:00 |
|
|
|
54851acfe2
|
删除安全检查记录信息优化
|
2025-10-10 15:16:43 +08:00 |
|
|
|
25f564b2b7
|
隐患工单派发生成隐患单去重
|
2025-10-10 13:59:13 +08:00 |
|
