2159 Commits

Author SHA1 Message Date
6158e1cd5b 增加个删除所有缓存接口 2025-10-30 16:32:46 +08:00
498e52fedd 日志打印太多了改成debug 2025-10-30 16:16:18 +08:00
50144f36ac 10s定时更新执法仪设备状态 2025-10-29 16:49:28 +08:00
ee73faae33 30s定时更新执法仪设备状态 2025-10-29 16:43:59 +08:00
e092cde020 每月/日出勤/在职人数统计优化 2025-10-29 16:42:42 +08:00
d47a774e18 ai预警上传文件路径重复/修复 2025-10-29 10:26:30 +08:00
c5ca758835 ai预警上传文件路径重复/修复 2025-10-29 10:26:17 +08:00
01e4c53cee 海康ai预警的事件码转int,可能大于int范围,需要截取后面9位 2025-10-28 15:30:05 +08:00
b23d4de36c 海康ai预警的事件码转int,可能大于int范围,需要截取后面9位 2025-10-28 15:25:57 +08:00
84d76e5a20 增加桥梁长度(m) 2025-10-28 14:20:59 +08:00
57fa0fcff7 Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang 2025-10-25 18:11:10 +08:00
4a59060bdc 添加自定义大屏配置信息,添加修改规则 2025-10-25 18:08:59 +08:00
d450a1f982 添加自定义大屏配置信息,添加修改规则 2025-10-25 18:08:11 +08:00
1629688cd4 合并解决冲突或升级jdk17语法 2025-10-25 17:14:20 +08:00
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
8d2e1a2e08 规则报警和异步线程池优化2 2025-10-25 16:44:39 +08:00
74f9894f7c 规则报警和异步线程池优化2 2025-10-25 16:41:35 +08:00
8447b867f3 规则报警和异步线程池优化 2025-10-24 18:02:55 +08:00
01c3547352 登录null修复 2025-10-24 18:02:43 +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
13f7360162 各专业隐患小类风险走势图bug修复 2025-10-21 15:17:51 +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
4df713ca28 批量复制默认工种数据到某个项目bug修复 2025-10-17 19:04:22 +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